mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-09-23 04:23:47 +08:00
Synchronization code
This commit is contained in:
@@ -893,6 +893,10 @@ namespace SqlSugar
|
|||||||
ShortName = lastPareamter.Name,
|
ShortName = lastPareamter.Name,
|
||||||
TableName = this.Context.EntityMaintenance.GetTableName(lastPareamter.Type)
|
TableName = this.Context.EntityMaintenance.GetTableName(lastPareamter.Type)
|
||||||
};
|
};
|
||||||
|
if (this.Context.CurrentConnectionConfig?.MoreSettings?.PgSqlIsAutoToLower == false)
|
||||||
|
{
|
||||||
|
result.ShortName = this.SqlBuilder.GetTranslationColumnName(result.ShortName);
|
||||||
|
}
|
||||||
if (result.JoinIndex == 0)
|
if (result.JoinIndex == 0)
|
||||||
{
|
{
|
||||||
var firstPareamter = (express as LambdaExpression).Parameters.First();
|
var firstPareamter = (express as LambdaExpression).Parameters.First();
|
||||||
|
@@ -25,10 +25,10 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
mySqlConnectionString = mySqlConnectionString.Trim().TrimEnd(';') + ";charset=utf8;";
|
mySqlConnectionString = mySqlConnectionString.Trim().TrimEnd(';') + ";charset=utf8;";
|
||||||
}
|
}
|
||||||
if (!mySqlConnectionString.ToLower().Contains("min"))
|
//if (!mySqlConnectionString.ToLower().Contains("min"))
|
||||||
{
|
//{
|
||||||
mySqlConnectionString = mySqlConnectionString.Trim().TrimEnd(';') + ";min pool size=1";
|
// mySqlConnectionString = mySqlConnectionString.Trim().TrimEnd(';') + ";min pool size=1";
|
||||||
}
|
//}
|
||||||
base._DbConnection = new MySqlConnection(mySqlConnectionString);
|
base._DbConnection = new MySqlConnection(mySqlConnectionString);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
@@ -64,6 +64,7 @@ namespace SqlSugar
|
|||||||
new KeyValuePair<string, CSharpDataType>("int2",CSharpDataType.@short),
|
new KeyValuePair<string, CSharpDataType>("int2",CSharpDataType.@short),
|
||||||
new KeyValuePair<string, CSharpDataType>("smallint",CSharpDataType.@short),
|
new KeyValuePair<string, CSharpDataType>("smallint",CSharpDataType.@short),
|
||||||
new KeyValuePair<string, CSharpDataType>("int4",CSharpDataType.@int),
|
new KeyValuePair<string, CSharpDataType>("int4",CSharpDataType.@int),
|
||||||
|
new KeyValuePair<string, CSharpDataType>("serial",CSharpDataType.@int),
|
||||||
new KeyValuePair<string, CSharpDataType>("integer",CSharpDataType.@int),
|
new KeyValuePair<string, CSharpDataType>("integer",CSharpDataType.@int),
|
||||||
new KeyValuePair<string, CSharpDataType>("int8",CSharpDataType.@long),
|
new KeyValuePair<string, CSharpDataType>("int8",CSharpDataType.@long),
|
||||||
new KeyValuePair<string, CSharpDataType>("bigint",CSharpDataType.@long),
|
new KeyValuePair<string, CSharpDataType>("bigint",CSharpDataType.@long),
|
||||||
|
@@ -29,6 +29,17 @@ namespace SqlSugar
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Common Methods
|
#region Common Methods
|
||||||
|
public override string GetTableNameString
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (this.TableShortName != null&&this.Context.CurrentConnectionConfig?.MoreSettings?.PgSqlIsAutoToLower==false)
|
||||||
|
{
|
||||||
|
this.TableShortName = Builder.GetTranslationColumnName(this.TableShortName);
|
||||||
|
}
|
||||||
|
return base.GetTableNameString;
|
||||||
|
}
|
||||||
|
}
|
||||||
public override bool IsComplexModel(string sql)
|
public override bool IsComplexModel(string sql)
|
||||||
{
|
{
|
||||||
return Regex.IsMatch(sql, @"AS ""\w+\.\w+""")|| Regex.IsMatch(sql, @"AS ""\w+\.\w+\.\w+""");
|
return Regex.IsMatch(sql, @"AS ""\w+\.\w+""")|| Regex.IsMatch(sql, @"AS ""\w+\.\w+\.\w+""");
|
||||||
|
@@ -143,6 +143,13 @@ namespace SqlSugar
|
|||||||
var dbType = columnInfo?.DataType;
|
var dbType = columnInfo?.DataType;
|
||||||
if (dbType == null) {
|
if (dbType == null) {
|
||||||
var typeName = it.PropertyType.Name.ToLower();
|
var typeName = it.PropertyType.Name.ToLower();
|
||||||
|
if (columnInfo==null&&it.PropertyType.IsEnum)
|
||||||
|
{
|
||||||
|
if (this.Context.CurrentConnectionConfig?.MoreSettings?.TableEnumIsString!=true)
|
||||||
|
{
|
||||||
|
typeName = "int";
|
||||||
|
}
|
||||||
|
}
|
||||||
if (typeName == "int32")
|
if (typeName == "int32")
|
||||||
typeName = "int";
|
typeName = "int";
|
||||||
if (typeName == "int64")
|
if (typeName == "int64")
|
||||||
|
Reference in New Issue
Block a user