Synchronized code

This commit is contained in:
sunkaixuan 2024-11-12 17:03:55 +08:00
parent 7bafb92f87
commit b10d787452

View File

@ -8,14 +8,7 @@ namespace SqlSugar
{ {
public override string GetDbTypeName(string csharpTypeName) public override string GetDbTypeName(string csharpTypeName)
{ {
if (csharpTypeName?.StartsWith("ora")==true&& this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.Vastbase) csharpTypeName = GetValidCsharpTypeName(csharpTypeName);
{
csharpTypeName= csharpTypeName.Replace("ora", "");
}
else if (csharpTypeName?.StartsWith("mssql_") == true && this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.Vastbase)
{
csharpTypeName = csharpTypeName.Replace("mssql_", "");
}
if (csharpTypeName == UtilConstants.ByteArrayType.Name) if (csharpTypeName == UtilConstants.ByteArrayType.Name)
return "bytea"; return "bytea";
if (csharpTypeName.ToLower() == "int32") if (csharpTypeName.ToLower() == "int32")
@ -34,9 +27,25 @@ namespace SqlSugar
else else
return "varchar"; return "varchar";
} }
private string GetValidCsharpTypeName(string csharpTypeName)
{
if (csharpTypeName?.StartsWith("ora") == true && this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.Vastbase)
{
csharpTypeName = csharpTypeName.Replace("ora", "");
}
else if (csharpTypeName?.StartsWith("mssql_") == true && this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.Vastbase)
{
csharpTypeName = csharpTypeName.Replace("mssql_", "");
}
return csharpTypeName;
}
public override string GetPropertyTypeName(string dbTypeName) public override string GetPropertyTypeName(string dbTypeName)
{ {
dbTypeName = dbTypeName.ToLower(); dbTypeName = dbTypeName.ToLower();
dbTypeName = GetValidCsharpTypeName(dbTypeName);
var propertyTypes = MappingTypes.Where(it => it.Value.ToString().ToLower() == dbTypeName || it.Key.ToLower() == dbTypeName); var propertyTypes = MappingTypes.Where(it => it.Value.ToString().ToLower() == dbTypeName || it.Key.ToLower() == dbTypeName);
if (propertyTypes == null) if (propertyTypes == null)
{ {
@ -153,7 +162,16 @@ namespace SqlSugar
new KeyValuePair<string, CSharpDataType>("varbit",CSharpDataType.@byte), new KeyValuePair<string, CSharpDataType>("varbit",CSharpDataType.@byte),
new KeyValuePair<string, CSharpDataType>("time",CSharpDataType.TimeSpan), new KeyValuePair<string, CSharpDataType>("time",CSharpDataType.TimeSpan),
new KeyValuePair<string, CSharpDataType>("public.geometry",CSharpDataType.@object), new KeyValuePair<string, CSharpDataType>("public.geometry",CSharpDataType.@object),
new KeyValuePair<string, CSharpDataType>("inet",CSharpDataType.@object) new KeyValuePair<string, CSharpDataType>("inet",CSharpDataType.@object),
new KeyValuePair<string, CSharpDataType>("number",CSharpDataType.@int),
new KeyValuePair<string, CSharpDataType>("number",CSharpDataType.@float),
new KeyValuePair<string, CSharpDataType>("number",CSharpDataType.@short),
new KeyValuePair<string, CSharpDataType>("number",CSharpDataType.@byte),
new KeyValuePair<string, CSharpDataType>("number",CSharpDataType.@double),
new KeyValuePair<string, CSharpDataType>("number",CSharpDataType.@long),
new KeyValuePair<string, CSharpDataType>("number",CSharpDataType.@bool),
new KeyValuePair<string, CSharpDataType>("number",CSharpDataType.@decimal),
}; };
public override List<string> StringThrow public override List<string> StringThrow
{ {