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

Update Core

Browse Source
This commit is contained in:
sunkaixuan
2022-05-21 11:18:46 +08:00
parent f97e828cb2
commit 2c25ed6226
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ExpressionContext.cs
View File

@@ -134,6 +134,7 @@ namespace SqlSugar
copyContext.IsSingle = this.IsSingle; copyContext.IsSingle = this.IsSingle;
copyContext.RootExpression = this.RootExpression; copyContext.RootExpression = this.RootExpression;
copyContext.TableEnumIsString = this.TableEnumIsString; copyContext.TableEnumIsString = this.TableEnumIsString;
copyContext.SugarContext = this.SugarContext;
return copyContext; return copyContext;
} }
public ExpressionContext GetCopyContextWithMapping() public ExpressionContext GetCopyContextWithMapping()

6
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs
View File

@@ -86,6 +86,12 @@ namespace SqlSugar
AppendValue(parameter, isLeft, value); AppendValue(parameter, isLeft, value);
} }
} }
else if(expression.Expression is UnaryExpression&&(expression.Expression as UnaryExpression).Operand is ParameterExpression)
{
var memParameter = (expression.Expression as UnaryExpression).Operand as ParameterExpression;
var name = ExpressionTool.GetMemberName(expression);
this.Context.Result.Append(this.Context.GetTranslationColumnName(memParameter.Name+"."+name));
}
else else
{ {
ResolveMemberValue(parameter, baseParameter, isLeft, isSetTempData, expression); ResolveMemberValue(parameter, baseParameter, isLeft, isSetTempData, expression);

9
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs
View File

@@ -280,11 +280,18 @@ namespace SqlSugar
base.AppendValue(parameter, isLeft, parameterName); base.AppendValue(parameter, isLeft, parameterName);
} }
} }
catch catch(Exception ex)
{
if (ex is SqlSugarException)
{
Check.Exception(true, string.Format(ex.Message, express.Method.Name));
}
else
{ {
Check.Exception(true, string.Format(ErrorMessage.MethodError, express.Method.Name)); Check.Exception(true, string.Format(ErrorMessage.MethodError, express.Method.Name));
} }
} }
}
private void NativeExtensionMethod(ExpressionParameter parameter, MethodCallExpression express, bool? isLeft, string name, List<MethodCallExpressionArgs> appendArgs = null) private void NativeExtensionMethod(ExpressionParameter parameter, MethodCallExpression express, bool? isLeft, string name, List<MethodCallExpressionArgs> appendArgs = null)
{ {

5
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/OneToManyNavgateExpression.cs
View File

@@ -135,7 +135,10 @@ namespace SqlSugar
} }
private MapperSql GetOneToManySql() private MapperSql GetOneToManySql()
{ {
var pk = this.EntityInfo.Columns.First(it => it.IsPrimarykey == true).DbColumnName; var pkColumn = this.EntityInfo.Columns.FirstOrDefault(it => it.IsPrimarykey == true);
Check.ExceptionEasy(pkColumn == null, $"{this.EntityInfo.EntityName} need primary key ",
$"导航属性 {this.EntityInfo.EntityName}需要主键");
var pk = pkColumn.DbColumnName;
var name = this.ProPertyEntity.Columns.First(it => it.PropertyName == Navigat.Name).DbColumnName; var name = this.ProPertyEntity.Columns.First(it => it.PropertyName == Navigat.Name).DbColumnName;
//var selectName = this.ProPertyEntity.Columns.First(it => it.PropertyName == MemberName).DbColumnName; //var selectName = this.ProPertyEntity.Columns.First(it => it.PropertyName == MemberName).DbColumnName;
MapperSql mapper = new MapperSql(); MapperSql mapper = new MapperSql();