lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-09-19 01:58:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronous code

Browse Source
This commit is contained in:
sunkaixuan
2025-06-09 18:38:56 +08:00
parent 27a019e876
commit 40d1bf1107
10 changed files with 117 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Asp.Net/SqlSugar/Abstract/FastestProvider/FastestProvider.cs
View File

@@ -63,7 +63,7 @@ namespace SqlSugar
{
if (this.GetBuider()?.DbFastestProperties?.NoPage == true)
{
Size = int.MaxValue;
Size = int.MaxValue/2;
}
int resul=0;
await this.context.Utilities.PageEachAsync(datas, Size, async item =>

1
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
View File

@@ -1110,6 +1110,7 @@ namespace SqlSugar
public List<string> AutoAppendedColumns { get; set; }
public Dictionary<string, string> MappingKeys { get; set; }
public List<KeyValuePair<string,string>> SelectNewIgnoreColumns { get; set; }
public bool IsAnyParameterExpression { get; set; }
#endregion
private string GetTableName(string entityName)

7
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider_Condition.cs
View File

@@ -400,7 +400,12 @@ namespace SqlSugar
item.FieldValue = "null";
}
builder.AppendFormat(temp, type, item.FieldName.ToSqlFilter(), "=", parameterName);
parameters.Add(new SugarParameter(parameterName, GetFieldValue(item)));
var p = new SugarParameter(parameterName, GetFieldValue(item));
if (item.CSharpTypeName == "DateOnly")
{
p.DbType = System.Data.DbType.Date;
}
parameters.Add(p);
}
}
#endregion

2
Src/Asp.Net/SqlSugar/CacheScheme/CacheSchemeMain.cs
View File

@@ -55,7 +55,7 @@ namespace SqlSugar
{
foreach (var item in keys)
{
if (item.ToLower().Contains(likeString.ToLower()))
if (item!=null&&item.ToLower().Contains(likeString.ToLower()))
{
cacheService.Remove<string>(item);
}

29
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve_NewExp.cs
View File

@@ -55,6 +55,35 @@ namespace SqlSugar
protected void ResolveNewExpressions(ExpressionParameter parameter, Expression item, string asName)
{
if (item is ParameterExpression)
{
var itemType = item.Type;
var ignoreProperty = itemType.GetProperties().FirstOrDefault(it => it.PropertyType == itemType);
if (ignoreProperty != null && ignoreProperty.Name != asName)
{
if (this.Context.SugarContext.QueryBuilder.SelectNewIgnoreColumns == null)
{
this.Context.SugarContext.QueryBuilder.SelectNewIgnoreColumns = new List<KeyValuePair<string, string>>();
}
this.Context.SugarContext.QueryBuilder.SelectNewIgnoreColumns.Add(new KeyValuePair<string, string>(ignoreProperty.Name, itemType.Name));
}
if (this.Context?.SugarContext?.Context != null)
{
var entityInfoColumns = this.Context?.SugarContext?.Context.EntityMaintenance.GetEntityInfo(item.Type)
.Columns
.Where(it=>it.PropertyInfo!=ignoreProperty)
.Where(it=>it.IsIgnore==true)
.Where(it => it.PropertyInfo.PropertyType.IsClass()).ToList();
foreach (var itemColumnInfo in entityInfoColumns)
{
if (this.Context.SugarContext.QueryBuilder.SelectNewIgnoreColumns == null)
{
this.Context.SugarContext.QueryBuilder.SelectNewIgnoreColumns = new List<KeyValuePair<string, string>>();
}
this.Context.SugarContext.QueryBuilder.SelectNewIgnoreColumns.Add(new KeyValuePair<string, string>(itemColumnInfo.PropertyInfo.Name, itemType.Name));
}
}
}
if (item is ConstantExpression)
{
ResolveConst(parameter, item, asName);

43
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/ConditionalExpressionResolve.cs
View File

@@ -17,6 +17,7 @@ namespace SqlSugar
express.IfTrue,
express.IfFalse
};
SetSingleTableNameSubqueryShortName(express);
if (ExpressionTool.GetParameters(express.Test).Count == 0)
{
while (express != null)
@@ -36,7 +37,7 @@ namespace SqlSugar
// 如果选择的分支还是一个条件表达式，就继续展开
if (ExpressionTool.RemoveConvert(next) is ConditionalExpression childConditional)
{
express = childConditional;
express = childConditional;
args = new List<Expression>() {
express.Test,
express.IfTrue,
@@ -89,6 +90,46 @@ namespace SqlSugar
}
}
private void SetSingleTableNameSubqueryShortName(ConditionalExpression express)
{
if (this.Context.IsSingle && express.Test is MethodCallExpression callExpression)
{
var list = callExpression.Arguments.ToList();
list.Add(callExpression);
if (express.IfTrue is MethodCallExpression callExpressionLeft)
{
list.Add(callExpressionLeft);
list.AddRange(callExpressionLeft.Arguments);
}
if (express.IfFalse is MethodCallExpression callExpressionRight)
{
list.Add(callExpressionRight);
list.AddRange(callExpressionRight.Arguments);
}
foreach (var item in list)
{
if (item is MethodCallExpression itemObj)
{
if (ExpressionTool.IsSubQuery(itemObj))
{
if (this.Context.SingleTableNameSubqueryShortName == null)
{
if (this.Context.SugarContext?.QueryBuilder?.SelectValue is LambdaExpression lambda)
{
if (lambda?.Parameters?.Count == 1)
{
this.Context.SingleTableNameSubqueryShortName = lambda.Parameters.FirstOrDefault()?.Name;
continue;
}
}
}
}
}
}
}
}
private static bool IsBoolMember(ConditionalExpression express)
{
return express.Test is MemberExpression && (express.Test as MemberExpression).Expression is ParameterExpression;

9
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MemberInitExpressionResolve.cs
View File

@@ -322,6 +322,7 @@ namespace SqlSugar
private void Select(MemberInitExpression expression, ExpressionParameter parameter, bool isSingle)
{
var isAnyParameterExpression = false;
foreach (MemberBinding binding in expression.Bindings)
{
if (binding.BindingType != MemberBindingType.Assignment)
@@ -356,8 +357,16 @@ namespace SqlSugar
item = (item as UnaryExpression).Operand;
}
}
if(item is ParameterExpression)
{
isAnyParameterExpression = true;
}
ResolveNewExpressions(parameter, item, memberName);
}
if (isAnyParameterExpression && this.Context?.SugarContext?.QueryBuilder is QueryBuilder builder)
{
builder.IsAnyParameterExpression = true;
}
}
private static bool IsNullable(Type memtype)

13
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/NewExpressionResolve.cs
View File

@@ -158,19 +158,6 @@ namespace SqlSugar
continue;
}
++i;
if (item is ParameterExpression)
{
var itemType = item.Type;
var ignoreProperty = itemType.GetProperties().FirstOrDefault(it => it.PropertyType == itemType);
if (ignoreProperty!=null&& ignoreProperty.Name!=memberName)
{
if (this.Context.SugarContext.QueryBuilder.SelectNewIgnoreColumns == null)
{
this.Context.SugarContext.QueryBuilder.SelectNewIgnoreColumns = new List<KeyValuePair<string, string>>();
}
this.Context.SugarContext.QueryBuilder.SelectNewIgnoreColumns.Add(new KeyValuePair<string, string>(ignoreProperty.Name, itemType.Name));
}
}
ResolveNewExpressions(parameter, item, memberName);
}
}

24
Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs
View File

@@ -264,6 +264,28 @@ namespace SqlSugar
var tType = typeof(T);
var classProperties = tType.GetProperties()
.Where(p => p.GetIndexParameters().Length == 0).ToList();
if(this.QueryBuilder is QueryBuilder q)
{
if (q.IsAnyParameterExpression)
{
if (q.SelectValue is LambdaExpression lambda)
{
if (lambda.Body is MemberInitExpression memberInit)
{
// 获取memberInit中定义的属性名称
var memberNames = memberInit.Bindings
.OfType<MemberAssignment>()
.Select(b => b.Member.Name)
.ToList();
// 过滤掉不在memberInit中的属性
classProperties = classProperties
.Where(p => memberNames.Contains(p.Name))
.ToList();
}
}
}
}
var reval = new List<T>();
if (reader != null && !reader.IsClosed)
{
@@ -533,7 +555,7 @@ namespace SqlSugar
var type = UtilMethods.GetUnderType(item.PropertyType);
if (addValue == DBNull.Value || addValue == null)
{
if (item.PropertyType.IsIn(UtilConstants.IntType, UtilConstants.DecType, UtilConstants.DobType, UtilConstants.ByteType))
if (item.PropertyType.IsIn(UtilConstants.IntType,UtilConstants.LongType, UtilConstants.DecType, UtilConstants.DobType, UtilConstants.ByteType))
{
addValue = 0;
}

6
Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs
View File

@@ -122,7 +122,7 @@ namespace SqlSugar
case DbType.Vastbase:
default:
value = value
.Replace(wildcardStr, "\\\\" + wildcard);
.Replace(wildcardStr, "\\" + wildcard);
break;
}
@@ -1476,6 +1476,10 @@ namespace SqlSugar
CSharpTypeName = ctypename,
FieldValue = value
};
if (ctypename == "DateOnly")
{
return Convert.ToDateTime(value);
}
if (item.FieldValue == string.Empty && item.CSharpTypeName.HasValue() && !item.CSharpTypeName.EqualCase("string"))
{
return null;