Merge branch 'master' of https://github.com/dotnetcore/FreeSql

2881099 · 2881099 · commit 51d2a9298680 · 2022-12-20T22:03:00.000+08:00
diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs
@@ -491,13 +491,20 @@ object LocalExecuteScalar(string db, string sql)
                 }
             }
 
+            string CkNullablePrimaryAdapter(string dbType, bool isPrimary)
+            {
+                return isPrimary
+                    ? dbType.Replace("Nullable(", "").Replace(")", "")
+                    : dbType.Replace(" NOT NULL", "");
+            }
             string CkNullableAdapter(string dbType, bool isPrimary)
             {
                 return isPrimary
-                    ? dbType.Replace("Nullable(", "").Replace(") NOT NULL", "")
+                    ? dbType.Replace("Nullable(", "").Replace(")","").Replace(" NOT NULL", "")
                     : dbType.Replace(" NOT NULL", "");
             }
 
+
             string CkIntAdapter(string dbType)
             {
                 var result = dbType;

Original file line number	Diff line number	Diff line change
`@@ -491,13 +491,20 @@ object LocalExecuteScalar(string db, string sql)`
`491`	`491`	`}`
`492`	`492`	`}`
`493`	`493`
	`494`	`+ string CkNullablePrimaryAdapter(string dbType, bool isPrimary)`
	`495`	`+ {`
	`496`	`+ return isPrimary`
	`497`	`+ ? dbType.Replace("Nullable(", "").Replace(")", "")`
	`498`	`+ : dbType.Replace(" NOT NULL", "");`
	`499`	`+ }`
`494`	`500`	`string CkNullableAdapter(string dbType, bool isPrimary)`
`495`	`501`	`{`
`496`	`502`	`return isPrimary`
`497`		`- ? dbType.Replace("Nullable(", "").Replace(") NOT NULL", "")`
	`503`	`+ ? dbType.Replace("Nullable(", "").Replace(")","").Replace(" NOT NULL", "")`
`498`	`504`	`: dbType.Replace(" NOT NULL", "");`
`499`	`505`	`}`
`500`	`506`
	`507`	`+`
`501`	`508`	`string CkIntAdapter(string dbType)`
`502`	`509`	`{`
`503`	`510`	`var result = dbType;`