Support sqlserver table schema edit

This commit is contained in:
SwallowGG
2023-10-09 21:58:00 +08:00
parent afbef2d7ac
commit 35f15835f1
9 changed files with 162 additions and 128 deletions

View File

@ -274,6 +274,6 @@ public class MysqlMetaData extends DefaultMetaService implements MetaData {
@Override
public String getMetaDataName(String... names) {
return Arrays.stream(names).filter(name -> StringUtils.isBlank(name)).map(name -> "`" + name + "`").collect(Collectors.joining("."));
return Arrays.stream(names).filter(name -> StringUtils.isNotBlank(name)).map(name -> "`" + name + "`").collect(Collectors.joining("."));
}
}

View File

@ -285,6 +285,6 @@ public class OracleMetaData extends DefaultMetaService implements MetaData {
@Override
public String getMetaDataName(String... names) {
return Arrays.stream(names).filter(name -> StringUtils.isBlank(name)).map(name -> "\"" + name + "\"").collect(Collectors.joining("."));
return Arrays.stream(names).filter(name -> StringUtils.isNotBlank(name)).map(name -> "\"" + name + "\"").collect(Collectors.joining("."));
}
}

View File

@ -6,10 +6,12 @@ import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import ai.chat2db.plugin.sqlite.builder.SqliteBuilder;
import ai.chat2db.plugin.sqlite.type.SqliteCollationEnum;
import ai.chat2db.plugin.sqlite.type.SqliteColumnTypeEnum;
import ai.chat2db.plugin.sqlite.type.SqliteIndexTypeEnum;
import ai.chat2db.spi.MetaData;
import ai.chat2db.spi.SqlBuilder;
import ai.chat2db.spi.jdbc.DefaultMetaService;
import ai.chat2db.spi.model.Database;
import ai.chat2db.spi.model.Schema;
@ -43,6 +45,10 @@ public class SqliteMetaData extends DefaultMetaService implements MetaData {
return Lists.newArrayList();
}
@Override
public SqlBuilder getSqlBuilder() {
return new SqliteBuilder();
}
@Override
public TableMeta getTableMeta(String databaseName, String schemaName, String tableName) {
return TableMeta.builder()
@ -56,6 +62,6 @@ public class SqliteMetaData extends DefaultMetaService implements MetaData {
@Override
public String getMetaDataName(String... names) {
return Arrays.stream(names).filter(name -> StringUtils.isBlank(name)).map(name -> "\"" + name + "\"").collect(Collectors.joining("."));
return Arrays.stream(names).filter(name -> StringUtils.isNotBlank(name)).map(name -> "\"" + name + "\"").collect(Collectors.joining("."));
}
}

View File

@ -14,7 +14,7 @@ public class SqliteBuilder implements SqlBuilder {
public String buildCreateTableSql(Table table) {
StringBuilder script = new StringBuilder();
script.append("CREATE TABLE ");
script.append("\"").append(table.getName()).append("\"").append(" (").append("\n");
script.append("\"").append(table.getDatabaseName()).append("\".\"").append(table.getName()).append("\"").append(" (").append("\n");
// append column
for (TableColumn column : table.getColumnList()) {
@ -37,30 +37,6 @@ public class SqliteBuilder implements SqlBuilder {
script = new StringBuilder(script.substring(0, script.length() - 2));
script.append("\n)");
if (StringUtils.isNotBlank(table.getEngine())) {
script.append(" ENGINE=").append(table.getEngine());
}
if (StringUtils.isNotBlank(table.getCharset())) {
script.append(" DEFAULT CHARACTER SET=").append(table.getCharset());
}
if (StringUtils.isNotBlank(table.getCollate())) {
script.append(" COLLATE=").append(table.getCollate());
}
if (table.getIncrementValue() != null) {
script.append(" AUTO_INCREMENT=").append(table.getIncrementValue());
}
if (StringUtils.isNotBlank(table.getComment())) {
script.append(" COMMENT='").append(table.getComment()).append("'");
}
if (StringUtils.isNotBlank(table.getPartition())) {
script.append(" \n").append(table.getPartition());
}
script.append(";");
return script.toString();
@ -69,30 +45,27 @@ public class SqliteBuilder implements SqlBuilder {
@Override
public String buildModifyTaleSql(Table oldTable, Table newTable) {
StringBuilder script = new StringBuilder();
script.append("ALTER TABLE ").append("\"").append(oldTable.getName()).append("\"").append("\n");
if (!StringUtils.equalsIgnoreCase(oldTable.getName(), newTable.getName())) {
script.append("\t").append("RENAME TO ").append("\"").append(newTable.getName()).append("\"").append(",\n");
}
if (!StringUtils.equalsIgnoreCase(oldTable.getComment(), newTable.getComment())) {
script.append("\t").append("COMMENT=").append("'").append(newTable.getComment()).append("'").append(",\n");
}
if (oldTable.getIncrementValue() != newTable.getIncrementValue()) {
script.append("\t").append("AUTO_INCREMENT=").append(newTable.getIncrementValue()).append(",\n");
script.append("ALTER TABLE ").append("\"").append(oldTable.getDatabaseName()).append("\".\"").append(oldTable.getName()).append("\"").append("\n");
script.append("\t").append("RENAME TO ").append("\"").append(newTable.getName()).append("\"").append(";\n");
}
// append modify column
for (TableColumn tableColumn : newTable.getColumnList()) {
if (StringUtils.isNotBlank(tableColumn.getEditStatus()) && StringUtils.isNotBlank(tableColumn.getColumnType())&& StringUtils.isNotBlank(tableColumn.getName())){
script.append("ALTER TABLE ").append("\"").append(newTable.getDatabaseName()).append("\".\"").append(newTable.getName()).append("\"").append("\n");
SqliteColumnTypeEnum typeEnum = SqliteColumnTypeEnum.getByType(tableColumn.getColumnType());
script.append("\t").append(typeEnum.buildModifyColumn(tableColumn)).append(",\n");
script.append("\t").append(typeEnum.buildModifyColumn(tableColumn)).append(";\n");
}
}
// append modify index
for (TableIndex tableIndex : newTable.getIndexList()) {
if (StringUtils.isNotBlank(tableIndex.getEditStatus()) && StringUtils.isNotBlank(tableIndex.getType())) {
// script.append("ALTER TABLE ").append("\"").append(newTable.getDatabaseName()).append("\".\"").append(newTable.getName()).append("\"").append("\n");
SqliteIndexTypeEnum sqliteIndexTypeEnum = SqliteIndexTypeEnum.getByType(tableIndex.getType());
script.append("\t").append(sqliteIndexTypeEnum.buildModifyIndex(tableIndex)).append(",\n");
script.append("\t").append(sqliteIndexTypeEnum.buildModifyIndex(tableIndex)).append(";\n");
}
}

View File

@ -14,14 +14,14 @@ import java.util.Map;
public enum SqliteColumnTypeEnum implements ColumnBuilder {
INTEGER("INTEGER", true, false, true, false, false, true, true, false, false, false),
INTEGER("INTEGER", true, false, true, false, false, true, false, false, false, false),
REAL("REAL", true, false, true, false, false, true, true, false, false, false),
REAL("REAL", true, false, true, false, false, true, false, false, false, false),
BLOB("BLOB", true, false, true, false, false, true, true, false, false, false),
BLOB("BLOB", true, false, true, false, false, true, false, false, false, false),
TEXT("TEXT", true, false, true, false, false, true, true, false, false, false),
TEXT("TEXT", true, false, true, false, false, true, false, false, false, false),
;
private ColumnType columnType;
@ -56,7 +56,7 @@ public enum SqliteColumnTypeEnum implements ColumnBuilder {
}
StringBuilder script = new StringBuilder();
script.append("`").append(column.getName()).append("`").append(" ");
script.append("\"").append(column.getName()).append("\"").append(" ");
script.append(buildDataType(column, type)).append(" ");
@ -72,7 +72,7 @@ public enum SqliteColumnTypeEnum implements ColumnBuilder {
script.append(buildAutoIncrement(column, type)).append(" ");
script.append(buildComment(column, type)).append(" ");
// script.append(buildComment(column, type)).append(" ");
return script.toString();
}
@ -94,19 +94,19 @@ public enum SqliteColumnTypeEnum implements ColumnBuilder {
@Override
public String buildModifyColumn(TableColumn tableColumn) {
if (EditStatus.DELETE.name().equals(tableColumn.getEditStatus())) {
return StringUtils.join("DROP COLUMN `", tableColumn.getName() + "`");
}
// if (EditStatus.DELETE.name().equals(tableColumn.getEditStatus())) {
// return StringUtils.join("DROP COLUMN \"", tableColumn.getName() + "\"");
// }
if (EditStatus.ADD.name().equals(tableColumn.getEditStatus())) {
return StringUtils.join("ADD COLUMN ", buildCreateColumnSql(tableColumn));
}
if (EditStatus.MODIFY.name().equals(tableColumn.getEditStatus())) {
if (!StringUtils.equalsIgnoreCase(tableColumn.getOldName(), tableColumn.getName())) {
return StringUtils.join("CHANGE COLUMN `", tableColumn.getOldName(), "` ", buildCreateColumnSql(tableColumn));
} else {
return StringUtils.join("MODIFY COLUMN ", buildCreateColumnSql(tableColumn));
}
return StringUtils.join("ADD ", buildCreateColumnSql(tableColumn));
}
// if (EditStatus.MODIFY.name().equals(tableColumn.getEditStatus())) {
// if (!StringUtils.equalsIgnoreCase(tableColumn.getOldName(), tableColumn.getName())) {
// return StringUtils.join("CHANGE COLUMN \"", tableColumn.getOldName(), "\" ", buildCreateColumnSql(tableColumn));
// } else {
// return StringUtils.join("MODIFY COLUMN ", buildCreateColumnSql(tableColumn));
// }
// }
return "";
}
@ -120,12 +120,6 @@ public enum SqliteColumnTypeEnum implements ColumnBuilder {
return "";
}
private String buildComment(TableColumn column, SqliteColumnTypeEnum type) {
if (!type.columnType.isSupportComments() || StringUtils.isEmpty(column.getComment())) {
return "";
}
return StringUtils.join("COMMENT '", column.getComment(), "'");
}
private String buildExt(TableColumn column, SqliteColumnTypeEnum type) {
if (!type.columnType.isSupportExtent() || StringUtils.isEmpty(column.getExtent())) {

View File

@ -63,11 +63,10 @@ public enum SqliteIndexTypeEnum {
script.append(keyword).append(" ");
script.append(buildIndexName(tableIndex)).append(" ");
script.append(buildIndexName(tableIndex)).append(" ON ").append(tableIndex.getTableName()).append(" ");
script.append(buildIndexColumn(tableIndex)).append(" ");
script.append(buildIndexComment(tableIndex)).append(" ");
return script.toString();
}
@ -86,7 +85,7 @@ public enum SqliteIndexTypeEnum {
script.append("(");
for (TableIndexColumn column : tableIndex.getColumnList()) {
if(StringUtils.isNotBlank(column.getColumnName())) {
script.append("`").append(column.getColumnName()).append("`").append(",");
script.append("\"").append(column.getColumnName()).append("\"").append(",");
}
}
script.deleteCharAt(script.length() - 1);
@ -98,7 +97,7 @@ public enum SqliteIndexTypeEnum {
if(this.equals(PRIMARY_KEY)){
return "";
}else {
return "`"+tableIndex.getName()+"`";
return "\""+tableIndex.getName()+"\"";
}
}
@ -110,7 +109,7 @@ public enum SqliteIndexTypeEnum {
return StringUtils.join(buildDropIndex(tableIndex),",\n", "ADD ", buildIndexScript(tableIndex));
}
if (EditStatus.ADD.name().equals(tableIndex.getEditStatus())) {
return StringUtils.join("ADD ", buildIndexScript(tableIndex));
return StringUtils.join("CREATE ", buildIndexScript(tableIndex));
}
return "";
}
@ -119,7 +118,7 @@ public enum SqliteIndexTypeEnum {
if (SqliteIndexTypeEnum.PRIMARY_KEY.getName().equals(tableIndex.getType())) {
return StringUtils.join("DROP PRIMARY KEY");
}
return StringUtils.join("DROP INDEX `", tableIndex.getOldName(),"`");
return StringUtils.join("DROP INDEX \"", tableIndex.getOldName(),"\"");
}
public static List<IndexType> getIndexTypes() {
return Arrays.asList(SqliteIndexTypeEnum.values()).stream().map(SqliteIndexTypeEnum::getIndexType).collect(java.util.stream.Collectors.toList());

View File

@ -6,9 +6,11 @@ import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import ai.chat2db.plugin.sqlserver.builder.SqlServerSqlBuilder;
import ai.chat2db.plugin.sqlserver.type.SqlServerColumnTypeEnum;
import ai.chat2db.plugin.sqlserver.type.SqlServerIndexTypeEnum;
import ai.chat2db.spi.MetaData;
import ai.chat2db.spi.SqlBuilder;
import ai.chat2db.spi.jdbc.DefaultMetaService;
import ai.chat2db.spi.model.*;
import ai.chat2db.spi.sql.SQLExecutor;
@ -64,6 +66,62 @@ public class SqlServerMetaData extends DefaultMetaService implements MetaData {
});
}
private static String SELECT_TABLES_SQL = "SELECT t.name AS TableName, mm.value as comment FROM sys.tables t LEFT JOIN(SELECT * from sys.extended_properties ep where ep.minor_id = 0 AND ep.name = 'MS_Description') mm ON t.object_id = mm.major_id WHERE t.schema_id= SCHEMA_ID('%S') ";
@Override
public List<Table> tables(Connection connection, String databaseName, String schemaName, String tableName) {
List<Table> tables = new ArrayList<>();
String sql = String.format(SELECT_TABLES_SQL, schemaName);
if (StringUtils.isNotBlank(tableName)) {
sql += " AND t.name = '" + tableName + "'";
}
return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
while (resultSet.next()) {
Table table = new Table();
table.setDatabaseName(databaseName);
table.setSchemaName(schemaName);
table.setName(resultSet.getString("TableName"));
table.setComment(resultSet.getString("comment"));
tables.add(table);
}
return tables;
});
}
private static final String SELECT_TABLE_COLUMNS = "SELECT c.name as COLUMN_NAME , c.is_nullable as IS_NULLABLE ,c.column_id as ORDINAL_POSITION,c.max_length as COLUMN_SIZE, c.scale as NUMERIC_SCALE, c.collation_name as COLLATION_NAME, ty.name as DATA_TYPE ,t.name, def.definition as COLUMN_DEFAULT, ep.value as COLUMN_COMMENT from sys.columns c LEFT JOIN sys.tables t on c.object_id=t.object_id LEFT JOIN sys.types ty ON c.user_type_id = ty.user_type_id LEFT JOIN sys.default_constraints def ON c.default_object_id = def.object_id LEFT JOIN sys.extended_properties ep ON t.object_id = ep.major_id AND c.column_id = ep.minor_id WHERE t.name ='%s' and t.schema_id=SCHEMA_ID('%s');";
@Override
public List<TableColumn> columns(Connection connection, String databaseName, String schemaName, String tableName) {
String sql = String.format(SELECT_TABLE_COLUMNS, tableName, schemaName);
List<TableColumn> tableColumns = new ArrayList<>();
return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
while (resultSet.next()) {
TableColumn column = new TableColumn();
column.setDatabaseName(databaseName);
column.setTableName(tableName);
column.setSchemaName(schemaName);
column.setOldName(resultSet.getString("COLUMN_NAME"));
column.setName(resultSet.getString("COLUMN_NAME"));
//column.setColumnType(resultSet.getString("COLUMN_TYPE"));
column.setColumnType(resultSet.getString("DATA_TYPE").toUpperCase());
//column.setDataType(resultSet.getInt("DATA_TYPE"));
column.setDefaultValue(resultSet.getString("COLUMN_DEFAULT"));
//column.setAutoIncrement(resultSet.getString("EXTRA").contains("auto_increment"));
column.setComment(resultSet.getString("COLUMN_COMMENT"));
// column.setPrimaryKey("PRI".equalsIgnoreCase(resultSet.getString("COLUMN_KEY")));
column.setNullable(resultSet.getInt("IS_NULLABLE"));
column.setOrdinalPosition(resultSet.getInt("ORDINAL_POSITION"));
column.setDecimalDigits(resultSet.getInt("NUMERIC_SCALE"));
column.setCharSetName(resultSet.getString("CHARACTER_SET_NAME"));
column.setCollationName(resultSet.getString("COLLATION_NAME"));
column.setColumnSize(resultSet.getInt("CHARACTER_MAXIMUM_LENGTH"));
//setColumnSize(column, resultSet.getString("COLUMN_TYPE"));
tableColumns.add(column);
}
return tableColumns;
});
}
private static String ROUTINES_SQL
= "SELECT type_desc, OBJECT_NAME(object_id) AS FunctionName, OBJECT_DEFINITION(object_id) AS "
+ "definition FROM sys.objects WHERE type_desc IN(%s) and name = '%s' ;";
@ -92,17 +150,13 @@ public class SqlServerMetaData extends DefaultMetaService implements MetaData {
@Override
public List<Function> functions(Connection connection, String databaseName, String schemaName) {
List<Function> functions = new ArrayList<>();
// List<Function> functions = SQLExecutor.getInstance().functions(connection, databaseName, schemaName);
// return functions.stream().map(function -> removeVersion(function)).collect(Collectors.toList());
String sql = String.format(OBJECT_SQL,"FN", schemaName);
String sql = String.format(OBJECT_SQL, "FN", schemaName);
return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
while (resultSet.next()) {
Function function = new Function();
function.setDatabaseName(databaseName);
function.setSchemaName(schemaName);
if (resultSet.next()) {
function.setFunctionName(resultSet.getString("name"));
}
functions.add(function);
}
return functions;
@ -122,15 +176,13 @@ public class SqlServerMetaData extends DefaultMetaService implements MetaData {
@Override
public List<Procedure> procedures(Connection connection, String databaseName, String schemaName) {
List<Procedure> procedures = new ArrayList<>();
String sql = String.format(OBJECT_SQL,"P", schemaName);
String sql = String.format(OBJECT_SQL, "P", schemaName);
return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
while (resultSet.next()) {
Procedure procedure = new Procedure();
procedure.setDatabaseName(databaseName);
procedure.setSchemaName(schemaName);
if (resultSet.next()) {
procedure.setProcedureName(resultSet.getString("name"));
}
procedures.add(procedure);
}
return procedures;
@ -225,6 +277,11 @@ public class SqlServerMetaData extends DefaultMetaService implements MetaData {
});
}
@Override
public SqlBuilder getSqlBuilder() {
return new SqlServerSqlBuilder();
}
@Override
public TableMeta getTableMeta(String databaseName, String schemaName, String tableName) {
return TableMeta.builder()
@ -238,6 +295,6 @@ public class SqlServerMetaData extends DefaultMetaService implements MetaData {
@Override
public String getMetaDataName(String... names) {
return Arrays.stream(names).filter(name -> StringUtils.isBlank(name)).map(name -> "[" + name + "]").collect(Collectors.joining("."));
return Arrays.stream(names).filter(name -> StringUtils.isNotBlank(name)).map(name -> "[" + name + "]").collect(Collectors.joining("."));
}
}

View File

@ -285,6 +285,11 @@ public enum SqlServerColumnTypeEnum implements ColumnBuilder {
StringBuilder script = new StringBuilder();
script.append("ALTER TABLE ").append("[").append(tableColumn.getSchemaName()).append("].[").append(tableColumn.getTableName()).append("]");
script.append(" ").append("ADD ").append(buildCreateColumnSql(tableColumn)).append(" \ngo\n");
if (StringUtils.isNotBlank(tableColumn.getComment())) {
script.append("\n").append(buildModifyColumnComment(tableColumn));
}
return script.toString();
}
if (EditStatus.MODIFY.name().equals(tableColumn.getEditStatus())) {

View File

@ -110,7 +110,7 @@ public class DefaultMetaService implements MetaData {
@Override
public String getMetaDataName(String... names) {
return Arrays.stream(names).filter(name -> StringUtils.isBlank(name)).collect(Collectors.joining("."));
return Arrays.stream(names).filter(name -> StringUtils.isNotBlank(name)).collect(Collectors.joining("."));
}