From 614cc966b02750ee479fe342dfb356f9dad23b38 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Fri, 11 Nov 2022 12:57:13 +0800 Subject: [PATCH] Synchronization code --- .../PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs | 2 +- Src/Asp.Net/SqlSugar/Utilities/UtilConvert.cs | 5 +++++ .../ResolveItems/MethodCallExpressionResolve.cs | 7 ++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs b/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs index 287ef2370..f53c6ee12 100644 --- a/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs @@ -88,7 +88,7 @@ namespace SqlSugar { return string.Format(SqlTemplateBatchSelect, "NULL"); } - return string.Format(SqlTemplateBatchSelect, "'" + value.ObjToString().ToSqlFilter() + "'"); + return string.Format(SqlTemplateBatchSelect, "'" + value.ObjToStringNoTrim().ToSqlFilter() + "'"); })) + "),"); ++i; } diff --git a/Src/Asp.Net/SqlSugar/Utilities/UtilConvert.cs b/Src/Asp.Net/SqlSugar/Utilities/UtilConvert.cs index e70608361..91824d143 100644 --- a/Src/Asp.Net/SqlSugar/Utilities/UtilConvert.cs +++ b/Src/Asp.Net/SqlSugar/Utilities/UtilConvert.cs @@ -98,6 +98,11 @@ namespace SqlSugar if (thisValue != null) return thisValue.ToString().Trim(); return ""; } + public static string ObjToStringNoTrim(this object thisValue) + { + if (thisValue != null) return thisValue.ToString(); + return ""; + } public static string ObjToStringNew(this object thisValue) { if (thisValue != null && thisValue is byte[]) diff --git a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs index 139dd57d2..3fa4f8749 100644 --- a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs +++ b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs @@ -380,6 +380,11 @@ namespace SqlSugar { Expression trueValue = Expression.Constant(true); var newItem = ExpressionBuilderHelper.CreateExpression(item, trueValue, ExpressionType.And); + var member = (item as MemberExpression); + if (member.Member.Name == "HasValue") + { + newItem = ExpressionBuilderHelper.CreateExpression(member.Expression, Expression.Constant(null), ExpressionType.And); + } AppendItem(parameter, name, new List() { newItem}, model, newItem); } else @@ -1002,7 +1007,7 @@ namespace SqlSugar case "Format": var xx=base.BaseParameter; var result = this.Context.DbMehtods.Format(model); - if (this.Context.MethodName.IsIn("RowNumber", "MappingColumn")) + if (!string.IsNullOrEmpty(this.Context.MethodName)) { result = this.Context.DbMehtods.FormatRowNumber(model); }