- 优化 IUpdate ToSql；

2881099 · 2881099 · commit 0e82d6c3e34b · 2022-06-30T13:54:51.000+08:00
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.Tests/FreeSql.Tests.DbContext/RepositoryTests.cs b/FreeSql.Tests/FreeSql.Tests.DbContext/RepositoryTests.cs
diff --git a/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteUpdateTest.cs b/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteUpdateTest.cs
@@ -1,4 +1,4 @@
-using FreeSql.DataAnnotations;
+﻿using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -174,6 +174,9 @@ public void Set()
 
             sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
             Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = NULL WHERE (\"Id\" = 1)", sql);
+
+            sql = update.SetIf(false, a => a.Clicks == null).Where(a => a.Id == 1).ToSql()?.Replace("\r\n", "");
+            Assert.Null(sql);
         }
         [Fact]
         public void SetRaw()
diff --git a/FreeSql/Internal/CommonProvider/DeleteProvider.cs b/FreeSql/Internal/CommonProvider/DeleteProvider.cs
@@ -177,6 +177,7 @@ public virtual string ToSql()
                 sb.Append(sql).Append("\r\n\r\n;\r\n\r\n");
             });
             if (sb.Length > 0) sb.Remove(sb.Length - 9, 9);
+            if (sb.Length == 0) return null;
             return sb.ToString();
         }
 
diff --git a/FreeSql/Internal/CommonProvider/UpdateProvider.cs b/FreeSql/Internal/CommonProvider/UpdateProvider.cs
@@ -797,6 +797,7 @@ public virtual string ToSql()
                 sb2.Append(sql).Append("\r\n\r\n;\r\n\r\n");
             });
             if (sb2.Length > 0) sb2.Remove(sb2.Length - 9, 9);
+            if (sb2.Length == 0) return null;
             return sb2.ToString();
         }
 
@@ -866,6 +867,7 @@ async public Task ToSqlFetchAsync(Func<StringBuilder, Task> fetchAsync)
         public virtual void ToSqlExtension110(StringBuilder sb, bool isAsTableSplited)
         {
             if (_where.Length == 0 && _source.Any() == false) return;
+            if (_source.Any() == false && _set.Length == 0 && _setIncr.Length == 0) return;
 
             if (_table.AsTableImpl != null && isAsTableSplited == false && _source == _sourceOld && _source.Any())
             {
diff --git a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseDelete.cs b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseDelete.cs
@@ -20,7 +20,7 @@ public ClickHouseDelete(IFreeSql orm, CommonUtils commonUtils, CommonExpression
 
         public override string ToSql()
         {
-            return base.ToSql().Replace("DELETE FROM ", "ALTER TABLE ").Replace(" WHERE ", " DELETE WHERE ");
+            return base.ToSql()?.Replace("DELETE FROM ", "ALTER TABLE ").Replace(" WHERE ", " DELETE WHERE ");
         }
 
 #if net40
diff --git a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs
@@ -68,6 +68,7 @@ protected override void ToSqlWhen(StringBuilder sb, ColumnInfo[] primarys, objec
         public override void ToSqlExtension110(StringBuilder sb, bool isAsTableSplited)
         {
             if (_where.Length == 0 && _source.Any() == false) return;
+            if (_source.Any() == false && _set.Length == 0 && _setIncr.Length == 0) return;
 
             if (_table.AsTableImpl != null && isAsTableSplited == false && _source == _sourceOld && _source.Any())
             {

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,7 @@ public virtual string ToSql()`
`177`	`177`	`sb.Append(sql).Append("\r\n\r\n;\r\n\r\n");`
`178`	`178`	`});`
`179`	`179`	`if (sb.Length > 0) sb.Remove(sb.Length - 9, 9);`
	`180`	`+ if (sb.Length == 0) return null;`
`180`	`181`	`return sb.ToString();`
`181`	`182`	`}`
`182`	`183`
Original file line number	Diff line number	Diff line change
`@@ -797,6 +797,7 @@ public virtual string ToSql()`
`797`	`797`	`sb2.Append(sql).Append("\r\n\r\n;\r\n\r\n");`
`798`	`798`	`});`
`799`	`799`	`if (sb2.Length > 0) sb2.Remove(sb2.Length - 9, 9);`
	`800`	`+ if (sb2.Length == 0) return null;`
`800`	`801`	`return sb2.ToString();`
`801`	`802`	`}`
`802`	`803`
`@@ -866,6 +867,7 @@ async public Task ToSqlFetchAsync(Func<StringBuilder, Task> fetchAsync)`
`866`	`867`	`public virtual void ToSqlExtension110(StringBuilder sb, bool isAsTableSplited)`
`867`	`868`	`{`
`868`	`869`	`if (_where.Length == 0 && _source.Any() == false) return;`
	`870`	`+ if (_source.Any() == false && _set.Length == 0 && _setIncr.Length == 0) return;`
`869`	`871`
`870`	`872`	`if (_table.AsTableImpl != null && isAsTableSplited == false && _source == _sourceOld && _source.Any())`
`871`	`873`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public ClickHouseDelete(IFreeSql orm, CommonUtils commonUtils, CommonExpression`
`20`	`20`
`21`	`21`	`public override string ToSql()`
`22`	`22`	`{`
`23`		`- return base.ToSql().Replace("DELETE FROM ", "ALTER TABLE ").Replace(" WHERE ", " DELETE WHERE ");`
	`23`	`+ return base.ToSql()?.Replace("DELETE FROM ", "ALTER TABLE ").Replace(" WHERE ", " DELETE WHERE ");`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`#if net40`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ protected override void ToSqlWhen(StringBuilder sb, ColumnInfo[] primarys, objec`
`68`	`68`	`public override void ToSqlExtension110(StringBuilder sb, bool isAsTableSplited)`
`69`	`69`	`{`
`70`	`70`	`if (_where.Length == 0 && _source.Any() == false) return;`
	`71`	`+ if (_source.Any() == false && _set.Length == 0 && _setIncr.Length == 0) return;`
`71`	`72`
`72`	`73`	`if (_table.AsTableImpl != null && isAsTableSplited == false && _source == _sourceOld && _source.Any())`
`73`	`74`	`{`