- 修复 GBase BIGSERIAL 自增问题；#1919

dotnetcore · Nov 12, 2024 · 8f25e50 · 8f25e50
1 parent 233990d
commit 8f25e50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/FreeSql/Internal/UtilsExpressionTree.cs b/FreeSql/Internal/UtilsExpressionTree.cs
@@ -313,7 +313,8 @@ public static ColumnInfo ColumnAttributeToInfo(TableInfo trytb, object entityDef
 					if (colType == typeof(int) || colType == typeof(uint))
 						colattr.DbType = "SERIAL";
 					else if (colType == typeof(long) || colType == typeof(ulong))
-						colattr.DbType = "SERIAL8";
+						colattr.DbType = colattr.DbType.IndexOf("BIGSERIAL", StringComparison.OrdinalIgnoreCase) != -1 ? 
+                            "BIGSERIAL" : "SERIAL8"; //#1919
 				}
 				if (colattr.MapType.NullableTypeOrThis() == typeof(DateTime))
 				{

diff --git a/Providers/FreeSql.Provider.GBase/Curd/GBaseInsert.cs b/Providers/FreeSql.Provider.GBase/Curd/GBaseInsert.cs
@@ -49,8 +49,8 @@ protected override long RawExecuteIdentity()
             {
                 if (identityType == typeof(int) || identityType == typeof(uint)) identitySql = "SELECT dbinfo('sqlca.sqlerrd1') FROM dual";
                 else if (identityType == typeof(long) || identityType == typeof(ulong)) identitySql = 
-                        identityCol.Attribute.DbType.IndexOf("bigserial", StringComparison.OrdinalIgnoreCase) != -1 ? 
-                        "SELECT dbinfo('bigserial') FROM dual" : "SELECT dbinfo('serial8') FROM dual";
+                    identityCol.Attribute.DbType.IndexOf("bigserial", StringComparison.OrdinalIgnoreCase) != -1 ? 
+                    "SELECT dbinfo('bigserial') FROM dual" : "SELECT dbinfo('serial8') FROM dual";
             }
             var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, string.Concat(sql, $"; {identitySql};"), _params);
             _orm.Aop.CurdBeforeHandler?.Invoke(this, before);