Merge pull request OtterMind#1178 from tmlx1990/fix1174

Chat2DB-Pro · web-flow · commit c2b5fed04a5f · 2024-02-26T10:14:05.000+08:00
fix：1174 达梦数据库新建表的时候可以设置自增
diff --git a/chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/type/DMColumnTypeEnum.java b/chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/type/DMColumnTypeEnum.java
@@ -47,7 +47,7 @@ public enum DMColumnTypeEnum implements ColumnBuilder {
 
     FLOAT("FLOAT", true, false, true, false, false, false, true, true, false, false),
 
-    INT("INT", false, false, true, false, false, false, true, true, false, false),
+    INT("INT", false, false, true, true, false, false, true, true, false, false),
 
     // INTEGER("INTEGER", false, false, true, false, false, false, true, true, false, false),
 
@@ -159,11 +159,26 @@ public String buildCreateColumnSql(TableColumn column) {
 
         script.append(buildDefaultValue(column, type)).append(" ");
 
+        script.append(buildAutoIncrement(column,type)).append(" ");
+
         script.append(buildNullable(column, type)).append(" ");
 
         return script.toString();
     }
 
+    private String buildAutoIncrement(TableColumn column, DMColumnTypeEnum type) {
+        if(!type.getColumnType().isSupportAutoIncrement()){
+            return "";
+        }
+        if (column.getAutoIncrement() != null && column.getAutoIncrement()
+                && column.getSeed() != null && column.getSeed() > 0 && column.getIncrement() != null && column.getIncrement() > 0) {
+            return "IDENTITY(" + column.getSeed() + "," + column.getIncrement() + ")";
+        }
+        if (column.getAutoIncrement() != null && column.getAutoIncrement()) {
+            return "IDENTITY(1,1)";
+        }
+        return "";
+    }
 
     private String buildNullable(TableColumn column, DMColumnTypeEnum type) {
         if (!type.getColumnType().isSupportNullable()) {
diff --git a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/TableColumn.java b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/TableColumn.java
@@ -199,16 +199,22 @@ public class TableColumn {
     // sqlserver
     private String defaultConstraintName;
 
+    // DM 种子
+    private Integer seed;
+
+    // DM 增量值
+    private Integer increment;
+
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) { return true;}
+        if (o == null || getClass() != o.getClass()) { return false;}
         TableColumn that = (TableColumn) o;
-        return Objects.equals(name, that.name) && Objects.equals(tableName, that.tableName) && Objects.equals(columnType, that.columnType) && Objects.equals(defaultValue, that.defaultValue) && Objects.equals(autoIncrement, that.autoIncrement) && Objects.equals(comment, that.comment) && Objects.equals(columnSize, that.columnSize) && Objects.equals(decimalDigits, that.decimalDigits) && Objects.equals(numPrecRadix, that.numPrecRadix) && Objects.equals(sqlDataType, that.sqlDataType) && Objects.equals(ordinalPosition, that.ordinalPosition) && Objects.equals(nullable, that.nullable) && Objects.equals(extent, that.extent) && Objects.equals(charSetName, that.charSetName) && Objects.equals(collationName, that.collationName) && Objects.equals(value, that.value) && Objects.equals(unit, that.unit) && Objects.equals(sparse, that.sparse) && Objects.equals(defaultConstraintName, that.defaultConstraintName);
+        return Objects.equals(name, that.name) && Objects.equals(tableName, that.tableName) && Objects.equals(columnType, that.columnType) && Objects.equals(defaultValue, that.defaultValue) && Objects.equals(autoIncrement, that.autoIncrement) && Objects.equals(comment, that.comment) && Objects.equals(columnSize, that.columnSize) && Objects.equals(decimalDigits, that.decimalDigits) && Objects.equals(numPrecRadix, that.numPrecRadix) && Objects.equals(sqlDataType, that.sqlDataType) && Objects.equals(ordinalPosition, that.ordinalPosition) && Objects.equals(nullable, that.nullable) && Objects.equals(extent, that.extent) && Objects.equals(charSetName, that.charSetName) && Objects.equals(collationName, that.collationName) && Objects.equals(value, that.value) && Objects.equals(unit, that.unit) && Objects.equals(sparse, that.sparse) && Objects.equals(defaultConstraintName, that.defaultConstraintName) && Objects.equals(seed, that.seed) && Objects.equals(increment, that.increment);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, tableName, columnType, defaultValue, autoIncrement, comment, columnSize, decimalDigits, numPrecRadix, sqlDataType, ordinalPosition, nullable, extent, charSetName, collationName, value, unit, sparse, defaultConstraintName);
+        return Objects.hash(name, tableName, columnType, defaultValue, autoIncrement, comment, columnSize, decimalDigits, numPrecRadix, sqlDataType, ordinalPosition, nullable, extent, charSetName, collationName, value, unit, sparse, defaultConstraintName, seed, increment);
     }
 }
