lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-05-18 14:09:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2024-01-25 20:04:48 +08:00
parent 7042880490
commit c64d0b5b9a
3 changed files with 61 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve_Helper.cs
View File

@ -156,7 +156,7 @@ namespace SqlSugar
}; };
model.Args.Add(methodCallExpressionArgs); model.Args.Add(methodCallExpressionArgs);
} }
else if (isFirst && isIIF && isIFFBoolMember&& (item as MemberExpression)?.Member?.Name=="HasValue") else if (isFirst && isIIF && isIFFBoolMember && (item as MemberExpression)?.Member?.Name == "HasValue")
{ {
var value = base.GetNewExpressionValue(item); var value = base.GetNewExpressionValue(item);
var methodCallExpressionArgs = new MethodCallExpressionArgs() var methodCallExpressionArgs = new MethodCallExpressionArgs()
@ -167,9 +167,9 @@ namespace SqlSugar
}; };
model.Args.Add(methodCallExpressionArgs); model.Args.Add(methodCallExpressionArgs);
} }
else if (name!=null && name != "MappingColumn" && !name.StartsWith("Row") &&ExpressionTool.GetMethodName(item)== "Format" && ExpressionTool.GetParameters(item).Count==0) else if (name != null && name != "MappingColumn" && !name.StartsWith("Row") && ExpressionTool.GetMethodName(item) == "Format" && ExpressionTool.GetParameters(item).Count == 0)
{ {
var value = ExpressionTool.DynamicInvoke(item); var value = ExpressionTool.DynamicInvoke(item);
var p = AppendParameter(value); var p = AppendParameter(value);
var methodCallExpressionArgs = new MethodCallExpressionArgs() var methodCallExpressionArgs = new MethodCallExpressionArgs()
{ {
@ -265,6 +265,31 @@ namespace SqlSugar
{ {
model.Args.Add(GetMethodCallArgs(parameter, (item as MemberExpression).Expression)); model.Args.Add(GetMethodCallArgs(parameter, (item as MemberExpression).Expression));
} }
else if (isBoolValue && isIIF && item is MemberExpression&&ExpressionTool.GetParameters(item).Count()==0)
{
var expValue = GetNewExpressionValue(item);
expValue = this.Context.DbMehtods.Equals(new MethodCallExpressionModel()
{
Name = "Equals",
Args = new List<MethodCallExpressionArgs>()
{
new MethodCallExpressionArgs(){
IsMember=true,
MemberName=expValue
},
new MethodCallExpressionArgs(){
IsMember=true,
MemberName= Context.DbMehtods.TrueValue()
}
}
});
model.Args.Add(new MethodCallExpressionArgs()
{
IsMember = false,
MemberName = expValue,
MemberValue = expValue
});
}
else if (isBoolValue && isIIF && item is MemberExpression) else if (isBoolValue && isIIF && item is MemberExpression)
{ {
var argItem = GetMethodCallArgs(parameter, (item as MemberExpression).Expression); var argItem = GetMethodCallArgs(parameter, (item as MemberExpression).Expression);
@ -277,7 +302,7 @@ namespace SqlSugar
} }
model.Args.Add(argItem); model.Args.Add(argItem);
} }
else if (name.IsIn("ListAny","ListAll") && item is LambdaExpression) else if (name.IsIn("ListAny", "ListAll") && item is LambdaExpression)
{ {
var sql = GetNewExpressionValue(item, ResolveExpressType.WhereMultiple); var sql = GetNewExpressionValue(item, ResolveExpressType.WhereMultiple);
var lamExp = (item as LambdaExpression); var lamExp = (item as LambdaExpression);
@ -482,7 +507,7 @@ namespace SqlSugar
} }
value = result; value = result;
} }
else if (name.IsIn("Contains", "StartsWith", "EndsWith") &&item==args.Last()&& ExpressionTool.IsSqlParameterDbType(this.Context, args.First())) else if (!(item is ParameterExpression)&& name.IsIn("Contains", "StartsWith", "EndsWith") &&item==args.Last()&& ExpressionTool.IsSqlParameterDbType(this.Context, args.First()))
{ {
var myvalue = ExpressionTool.DynamicInvoke(args.Last()); var myvalue = ExpressionTool.DynamicInvoke(args.Last());
var parametre = ExpressionTool.GetParameterBySqlParameterDbType(this.Context.ParameterIndex,myvalue, this.Context, args.First()); var parametre = ExpressionTool.GetParameterBySqlParameterDbType(this.Context.ParameterIndex,myvalue, this.Context, args.First());

1
Src/Asp.Net/SqlSugar/Interface/ISimpleClient.cs
View File

@ -13,6 +13,7 @@ namespace SqlSugar
RepositoryType CopyNew<RepositoryType>() where RepositoryType : ISugarRepository; RepositoryType CopyNew<RepositoryType>() where RepositoryType : ISugarRepository;
SimpleClient<ChangeType> Change<ChangeType>() where ChangeType : class, new(); SimpleClient<ChangeType> Change<ChangeType>() where ChangeType : class, new();
RepositoryType ChangeRepository<RepositoryType>() where RepositoryType : ISugarRepository ; RepositoryType ChangeRepository<RepositoryType>() where RepositoryType : ISugarRepository ;
RepositoryType ChangeRepository<RepositoryType>(IServiceProvider serviceProvider) where RepositoryType : ISugarRepository;
IDeleteable<T> AsDeleteable(); IDeleteable<T> AsDeleteable();
IInsertable<T> AsInsertable(List<T> insertObjs); IInsertable<T> AsInsertable(List<T> insertObjs);
IInsertable<T> AsInsertable(T insertObj); IInsertable<T> AsInsertable(T insertObj);

35
Src/Asp.Net/SqlSugar/SimpleClient.cs
View File

@ -79,11 +79,11 @@ namespace SqlSugar
} }
public RepositoryType CopyNew<RepositoryType>(IServiceProvider serviceProvider) where RepositoryType : ISugarRepository public RepositoryType CopyNew<RepositoryType>(IServiceProvider serviceProvider) where RepositoryType : ISugarRepository
{ {
var instance = handleDependencies(typeof(RepositoryType), serviceProvider); var instance = handleDependencies(typeof(RepositoryType), serviceProvider,true);
return (RepositoryType)instance; return (RepositoryType)instance;
} }
private object handleDependencies(Type type, IServiceProvider serviceProvider) private object handleDependencies(Type type, IServiceProvider serviceProvider,bool needNewCopy = false)
{ {
ConstructorInfo constructorInfo = null; ConstructorInfo constructorInfo = null;
var newInstanceType = type; var newInstanceType = type;
@ -103,8 +103,7 @@ namespace SqlSugar
object dependencyInstance = serviceProvider.GetService(type); object dependencyInstance = serviceProvider.GetService(type);
if (dependencyInstance is ISugarRepository sugarRepository) if (dependencyInstance is ISugarRepository sugarRepository)
{ {
sugarRepository.Context = sugarRepository.Context.CopyNew(); return setContext(sugarRepository, needNewCopy);
return sugarRepository;
} }
else else
{ {
@ -130,7 +129,28 @@ namespace SqlSugar
} }
return instance; return instance;
} }
private ISugarRepository setContext(ISugarRepository sugarRepository,bool needNewCopy)
{
if (sugarRepository.Context != null)
{
if (needNewCopy)
{
sugarRepository.Context = sugarRepository.Context.CopyNew();
}
}
else
{
if (needNewCopy)
{
sugarRepository.Context = this.Context.CopyNew();
}
else
{
sugarRepository.Context = this.Context;
}
}
return sugarRepository;
}
private bool IsAssignableToBaseRepository(Type type) private bool IsAssignableToBaseRepository(Type type)
{ {
var baseInterfaces = type.GetInterfaces(); var baseInterfaces = type.GetInterfaces();
@ -169,6 +189,11 @@ namespace SqlSugar
} }
return result; return result;
} }
public RepositoryType ChangeRepository<RepositoryType>(IServiceProvider serviceProvider) where RepositoryType : ISugarRepository
{
var instance = handleDependencies(typeof(RepositoryType), serviceProvider, false);
return (RepositoryType)instance;
}
public ISugarQueryable<T> AsQueryable() public ISugarQueryable<T> AsQueryable()
{ {
return Context.Queryable<T>(); return Context.Queryable<T>();