- 修复 SqlServer 批量更新 bool? null 值生成多余的 case when SQL；

dotnetcore · Dec 13, 2023 · 2368377 · 2368377
1 parent 09c8725
commit 2368377
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 113 deletions.
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/FreeSql/Internal/CommonProvider/UpdateProvider.cs b/FreeSql/Internal/CommonProvider/UpdateProvider.cs
@@ -858,6 +858,7 @@ protected string WhereCaseSource(string CsName, Func<string, string> thenValue)
                     new[] { typeof(string), typeof(DateTime), typeof(DateTime?) }.Contains(col.Attribute.MapType) ||
                     col.Attribute.MapType.NullableTypeOrThis().IsEnum;
                 var ds = _source.Select(a => col.GetDbValue(a)).ToArray();
+                if (valsameIf == false && ds[0] == null) valsameIf = true;
                 if (valsameIf && ds.All(a => object.Equals(a, ds[0])))
                 {
                     var val = ds.First();
@@ -1119,7 +1120,8 @@ public virtual void ToSqlExtension110(StringBuilder sb, bool isAsTableSplited)
                                 new[] { typeof(string), typeof(DateTime), typeof(DateTime?) }.Contains(col.Attribute.MapType) ||
                                 col.Attribute.MapType.NullableTypeOrThis().IsEnum;
                             var ds = _source.Select(a => col.GetDbValue(a)).ToArray();
-                            if (valsameIf && ds.All(a => object.Equals(a, ds[0])))
+							if (valsameIf == false && ds[0] == null) valsameIf = true;
+							if (valsameIf && ds.All(a => object.Equals(a, ds[0])))
                             {
                                 var val = ds.First();
                                 var colsql = _noneParameter ? _commonUtils.GetNoneParamaterSqlValue(_paramsSource, "u", col, col.Attribute.MapType, val) :