lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-05-04 12:47:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update core

Browse Source
This commit is contained in:
sunkaixuan 2022-05-07 13:25:05 +08:00
parent 03fe68f992
commit 4724bf3967
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
View File

@ -216,6 +216,7 @@ namespace SqlSugar
this.Context.Updateable(dt) this.Context.Updateable(dt)
.AS(tableName) .AS(tableName)
.Where($"{columnInfo.DbColumnName} is null ").ExecuteCommand(); .Where($"{columnInfo.DbColumnName} is null ").ExecuteCommand();
columnInfo.IsNullable = false;
UpdateColumn(tableName, columnInfo); UpdateColumn(tableName, columnInfo);
} }
return true; return true;

4
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/Items/SubSelect.cs
View File

@ -62,7 +62,7 @@ namespace SqlSugar
public void SetShortName(MethodCallExpression exp, string result) public void SetShortName(MethodCallExpression exp, string result)
{ {
if (exp.Arguments[0] is LambdaExpression && result.IsContainsIn("+", "-")) if (exp.Arguments[0] is LambdaExpression && result.IsContainsIn("+", "-","*","/"))
{ {
var parameters = (exp.Arguments[0] as LambdaExpression).Parameters; var parameters = (exp.Arguments[0] as LambdaExpression).Parameters;
if (parameters != null && parameters.Count > 0) if (parameters != null && parameters.Count > 0)
@ -74,7 +74,7 @@ namespace SqlSugar
} }
public void SetShortNameNext(MethodCallExpression exp, string result) public void SetShortNameNext(MethodCallExpression exp, string result)
{ {
if (exp.Arguments.Count>1&&exp.Arguments[1] is LambdaExpression && result.IsContainsIn("+", "-")) if (exp.Arguments.Count>1&&exp.Arguments[1] is LambdaExpression && result.IsContainsIn("+", "-", "*", "/"))
{ {
var parameters = (exp.Arguments[1] as LambdaExpression).Parameters; var parameters = (exp.Arguments[1] as LambdaExpression).Parameters;
if (parameters != null && parameters.Count > 0) if (parameters != null && parameters.Count > 0)

2
Src/Asp.NetCore2/SqlSugar/Infrastructure/ContextMethods.cs
View File

@ -757,6 +757,7 @@ namespace SqlSugar
{ {
// ConditionalType = (ConditionalType)Convert.ToInt32(), // ConditionalType = (ConditionalType)Convert.ToInt32(),
FieldName = item["FieldName"] + "", FieldName = item["FieldName"] + "",
CSharpTypeName = item["CSharpTypeName"] ==null?null: item["CSharpTypeName"].ObjToString(),
FieldValue = item["FieldValue"].Value<string>()==null?null: item["FieldValue"].ToString() FieldValue = item["FieldValue"].Value<string>()==null?null: item["FieldValue"].ToString()
}; };
if (typeValue.IsInt()) if (typeValue.IsInt())
@ -795,6 +796,7 @@ namespace SqlSugar
{ {
ConditionalType = (ConditionalType)Convert.ToInt32(value["ConditionalType"].Value<int>()), ConditionalType = (ConditionalType)Convert.ToInt32(value["ConditionalType"].Value<int>()),
FieldName = value["FieldName"] + "", FieldName = value["FieldName"] + "",
CSharpTypeName= value["CSharpTypeName"]==null?null : value["CSharpTypeName"].ObjToString(),
FieldValue = value["FieldValue"].Value<string>() == null ? null : value["FieldValue"].ToString() FieldValue = value["FieldValue"].Value<string>() == null ? null : value["FieldValue"].ToString()
}; };
} }

2
Src/Asp.NetCore2/SqlSugar/Realization/MySql/MySqlProvider.cs
View File

@ -20,7 +20,7 @@ namespace SqlSugar
try try
{ {
var mySqlConnectionString = base.Context.CurrentConnectionConfig.ConnectionString; var mySqlConnectionString = base.Context.CurrentConnectionConfig.ConnectionString;
if (!mySqlConnectionString.ToLower().Contains("charset")) if (!mySqlConnectionString.ToLower().Contains("charset")&& !mySqlConnectionString.ToLower().Contains("character"))
{ {
mySqlConnectionString = mySqlConnectionString.Trim().TrimEnd(';') + ";charset=utf8;"; mySqlConnectionString = mySqlConnectionString.Trim().TrimEnd(';') + ";charset=utf8;";
} }

6
Src/Asp.NetCore2/SqlSugar/SqlSugarClient.cs
View File

@ -347,9 +347,9 @@ namespace SqlSugar
var result= this.Context.Queryable<T>(queryable); var result= this.Context.Queryable<T>(queryable);
var QueryBuilder = queryable.QueryBuilder; var QueryBuilder = queryable.QueryBuilder;
result.QueryBuilder.IsQueryInQuery = true; result.QueryBuilder.IsQueryInQuery = true;
result.QueryBuilder.WhereIndex = QueryBuilder.WhereIndex++; var appendIndex = result.QueryBuilder.Parameters==null?1:result.QueryBuilder.Parameters.Count+1;
result.QueryBuilder.LambdaExpressions.ParameterIndex = QueryBuilder.LambdaExpressions.ParameterIndex++; result.QueryBuilder.WhereIndex = (QueryBuilder.WhereIndex+1);
result.QueryBuilder.LambdaExpressions.Index = QueryBuilder.LambdaExpressions.Index++; result.QueryBuilder.LambdaExpressions.ParameterIndex = (QueryBuilder.LambdaExpressions.ParameterIndex+ appendIndex);
return result; return result;
} }