- 修复 Pgsql 批量更新使用 NoneParameter 后日期类型的语法 bug；

Author: 28810

FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlUpdateTest.cs

@@ -1,6 +1,7 @@
 using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Xunit;
 
 namespace FreeSql.Tests.MySqlConnector
@@ -180,7 +181,14 @@ public void WhereExists()
         [Fact]
         public void ExecuteAffrows()
         {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            var time = DateTime.Now;
+            var items222 = g.mysql.Select<Topic>().Where(a => a.CreateTime > time).Limit(10).ToList();
 
+            update.SetSource(items.First()).NoneParameter().ExecuteAffrows();
+            update.SetSource(items).NoneParameter().ExecuteAffrows();
         }
         [Fact]
         public void ExecuteUpdated()

FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlUpdateTest.cs

@@ -1,6 +1,7 @@
 using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Xunit;
 
 namespace FreeSql.Tests.MySql
@@ -181,7 +182,14 @@ public void WhereExists()
         [Fact]
         public void ExecuteAffrows()
         {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            var time = DateTime.Now;
+            var items222 = g.mysql.Select<Topic>().Where(a => a.CreateTime > time).Limit(10).ToList();
 
+            update.SetSource(items.First()).NoneParameter().ExecuteAffrows();
+            update.SetSource(items).NoneParameter().ExecuteAffrows();
         }
         [Fact]
         public void ExecuteUpdated()

FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLUpdateTest.cs

@@ -1,6 +1,7 @@
 using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Xunit;
 
 namespace FreeSql.Tests.PostgreSQL
@@ -120,7 +121,11 @@ public void WhereExists()
         [Fact]
         public void ExecuteAffrows()
         {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
 
+            update.SetSource(items.First()).NoneParameter().ExecuteAffrows();
+            update.SetSource(items).NoneParameter().ExecuteAffrows();
         }
         [Fact]
         public void ExecuteUpdated()

FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerUpdateTest.cs

@@ -2,6 +2,7 @@
 using FreeSql.Tests.DataContext.SqlServer;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Xunit;
 
 namespace FreeSql.Tests.SqlServer
@@ -131,7 +132,14 @@ public void WhereExists()
         [Fact]
         public void ExecuteAffrows()
         {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            var time = DateTime.Now;
+            var items222 = g.sqlserver.Select<Topic>().Where(a => a.CreateTime > time).Limit(10).ToList();
 
+            update.SetSource(items.First()).NoneParameter().ExecuteAffrows();
+            update.SetSource(items).NoneParameter().ExecuteAffrows();
         }
         [Fact]
         public void ExecuteUpdated()

FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteUpdateTest.cs

@@ -1,6 +1,7 @@
 using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Xunit;
 
 namespace FreeSql.Tests.Sqlite
@@ -124,7 +125,14 @@ public void WhereExists()
         [Fact]
         public void ExecuteAffrows()
         {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            var time = DateTime.Now;
+            var items222 = g.sqlite.Select<Topic>().Where(a => a.CreateTime > time).Limit(10).ToList();
 
+            update.SetSource(items.First()).NoneParameter().ExecuteAffrows();
+            update.SetSource(items).NoneParameter().ExecuteAffrows();
         }
         [Fact]
         public void ExecuteUpdated()

FreeSql/Internal/CommonProvider/UpdateProvider.cs

@@ -566,6 +566,7 @@ protected string WhereCaseSource(string CsName, Func<string, string> thenValue)
 
         protected abstract void ToSqlCase(StringBuilder caseWhen, ColumnInfo[] primarys);
         protected abstract void ToSqlWhen(StringBuilder sb, ColumnInfo[] primarys, object d);
+        protected virtual void ToSqlCaseWhenEnd(StringBuilder sb, ColumnInfo col) { }
 
         public IUpdate<T1> AsTable(Func<string, string> tableRule)
         {
@@ -658,7 +659,11 @@ public string ToSql()
                             if (isnull == false) isnull = value == null || value == DBNull.Value;
                         }
                         cwsb.Append(" END");
-                        if (isnull == false) sb.Append(cwsb.ToString());
+                        if (isnull == false)
+                        {
+                            ToSqlCaseWhenEnd(cwsb, col);
+                            sb.Append(cwsb.ToString());
+                        }
                         else sb.Append("NULL");
                         cwsb.Clear();
 

Providers/FreeSql.Provider.PostgreSQL/Curd/PostgreSQLUpdate.cs

@@ -136,5 +136,14 @@ protected override void ToSqlWhen(StringBuilder sb, ColumnInfo[] primarys, objec
             }
             sb.Append(")");
         }
+
+        protected override void ToSqlCaseWhenEnd(StringBuilder sb, ColumnInfo col)
+        {
+            if (_noneParameter == false) return;
+            var dbtype = _commonUtils.CodeFirst.GetDbInfo(col.Attribute.MapType)?.dbtype;
+            if (dbtype == null) return;
+
+            sb.Append("::").Append(dbtype);
+        }
     }
 }