diff --git a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java index abaf3346..1c725803 100644 --- a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java +++ b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java @@ -17,7 +17,7 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder { StringBuilder script = new StringBuilder(); script.append("CREATE TABLE "); if(StringUtils.isNotBlank(table.getDatabaseName())) { - script.append("`").append(table.getName()).append("`").append("."); + script.append("`").append(table.getDatabaseName()).append("`").append("."); } script.append("`").append(table.getName()).append("`").append(" (").append("\n"); 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 index 797f2771..215f1734 100644 --- 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 @@ -32,13 +32,13 @@ public class TableColumn { /** * 列名 */ - @JsonAlias({"COLUMN_NAME"}) + @JsonAlias({"COLUMN_NAME","column_name"}) private String name; /** * 表名 */ - @JsonAlias({"TABLE_NAME"}) + @JsonAlias({"TABLE_NAME","table_name"}) private String tableName; /** @@ -46,7 +46,7 @@ public class TableColumn { * 比如 varchar(100) ,double(10,6) */ - @JsonAlias({"TYPE_NAME"}) + @JsonAlias({"TYPE_NAME","type_name"}) private String columnType; /** @@ -54,7 +54,7 @@ public class TableColumn { * 比如 varchar ,double */ - @JsonAlias({"DATA_TYPE"}) + @JsonAlias({"DATA_TYPE","data_type"}) private Integer dataType; @@ -62,7 +62,7 @@ public class TableColumn { * 默认值 */ - @JsonAlias({"COLUMN_DEF"}) + @JsonAlias({"COLUMN_DEF","column_def"}) private String defaultValue; @@ -76,7 +76,7 @@ public class TableColumn { /** * 注释 */ - @JsonAlias({"REMARKS"}) + @JsonAlias({"REMARKS","remarks"}) private String comment; /** @@ -99,25 +99,25 @@ public class TableColumn { /** * 空间名 */ - @JsonAlias({"TABLE_SCHEM"}) + @JsonAlias({"TABLE_SCHEM","table_schem"}) private String schemaName; /** * 数据库名 */ - @JsonAlias({"TABLE_CAT"}) + @JsonAlias({"TABLE_CAT","table_cat"}) private String databaseName; - /** - * Data source dependent type name, for a UDT the type name is fully qualified - */ - private String typeName; +// /** +// * Data source dependent type name, for a UDT the type name is fully qualified +// */ +// private String typeName; /** * column size. */ - @JsonAlias({"COLUMN_SIZE"}) + @JsonAlias({"COLUMN_SIZE","column_size"}) private Integer columnSize; /** @@ -129,14 +129,14 @@ public class TableColumn { * the number of fractional digits. Null is returned for data types where DECIMAL_DIGITS is not applicable. */ - @JsonAlias({"DECIMAL_DIGITS"}) + @JsonAlias({"DECIMAL_DIGITS","decimal_digits"}) private Integer decimalDigits; /** * Radix (typically either 10 or 2) */ - @JsonAlias({"NUM_PREC_RADIX"}) + @JsonAlias({"NUM_PREC_RADIX","num_prec_radix"}) private Integer numPrecRadix; @@ -160,14 +160,14 @@ public class TableColumn { * index of column in table (starting at 1) */ - @JsonAlias({"ORDINAL_POSITION"}) + @JsonAlias({"ORDINAL_POSITION","ordinal_position"}) private Integer ordinalPosition; /** * ISO rules are used to determine the nullability for a column. */ - @JsonAlias({"NULLABLE"}) + @JsonAlias({"NULLABLE","nullable"}) private Integer nullable; /** @@ -204,11 +204,11 @@ public class TableColumn { 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(typeName, that.typeName) && 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); } @Override public int hashCode() { - return Objects.hash(name, tableName, columnType, defaultValue, autoIncrement, comment, typeName, 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); } }