- 增加 InsertDict ExecuteIdentity 重载指定自增列；

dotnetcore · Oct 31, 2023 · 52bc16d · 52bc16d
1 parent f83331c
commit 52bc16d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/FreeSql/Extensions/FreeSqlGlobalExtensions.cs b/FreeSql/Extensions/FreeSqlGlobalExtensions.cs
@@ -15,6 +15,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using System.Security.Principal;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -1069,7 +1070,13 @@ public InsertDictImpl CommandTimeout(int timeout)
         }
 
         public int ExecuteAffrows() => _insertProvider.ExecuteAffrows();
-        public long ExecuteIdentity() => _insertProvider.ExecuteIdentity();
+        public long ExecuteIdentity(string identityColumn = null)
+        {
+            if (_insertProvider._table.ColumnsByCs.TryGetValue(identityColumn, out var col) == false)
+                throw new Exception(CoreStrings.GetPrimarys_ParameterError_IsNotDictKey(identityColumn).Replace(nameof(ExecuteIdentity), ""));
+            col.Attribute.IsIdentity = true;
+            return _insertProvider.ExecuteIdentity();
+        }
         public List<Dictionary<string, object>> ExecuteInserted() => _insertProvider.ExecuteInserted();
 
 #if net40

diff --git a/Providers/FreeSql.Provider.Xugu/XuguExpression.cs b/Providers/FreeSql.Provider.Xugu/XuguExpression.cs
@@ -251,7 +251,7 @@ public override string ExpressionLambdaToSqlMemberAccessDateTime(MemberExpressio
                 {
                     case "Now": return _common.Now;
                     case "UtcNow": return _common.NowUtc;
-                    case "Today": return "convert(char(10),getdate(),120)";
+                    case "Today": return $"cast(date_format({_common.Now},'%Y-%m-%d') as datetime)";
                     case "MinValue": return "'1753/1/1 0:00:00'";
                     case "MaxValue": return "'9999/12/31 23:59:59'";
                 }