fix mariaDB connec database bug

This commit is contained in:
SwallowGG
2023-11-11 16:56:48 +08:00
parent b999c2556d
commit 097900a04a
3 changed files with 2 additions and 121 deletions

View File

@@ -2,16 +2,11 @@ package ai.chat2db.plugin.mariadb;
import java.sql.Connection;
import ai.chat2db.plugin.mysql.MysqlDBManage;
import ai.chat2db.spi.DBManage;
import ai.chat2db.spi.jdbc.DefaultDBManage;
import ai.chat2db.spi.sql.SQLExecutor;
public class MariaDBManage extends DefaultDBManage implements DBManage {
public class MariaDBManage extends MysqlDBManage implements DBManage {
@Override
public void dropTable(Connection connection, String databaseName, String schemaName, String tableName) {
String sql = "DROP TABLE " +tableName ;
SQLExecutor.getInstance().executeSql(connection,sql, resultSet -> null);
}
}

View File

@@ -1,122 +1,9 @@
package ai.chat2db.plugin.mariadb;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;
import ai.chat2db.plugin.mysql.MysqlMetaData;
import ai.chat2db.spi.MetaData;
import ai.chat2db.spi.jdbc.DefaultMetaService;
import ai.chat2db.spi.model.Function;
import ai.chat2db.spi.model.Procedure;
import ai.chat2db.spi.model.Table;
import ai.chat2db.spi.model.Trigger;
import ai.chat2db.spi.sql.SQLExecutor;
import jakarta.validation.constraints.NotEmpty;
public class MariaDBMetaData extends MysqlMetaData implements MetaData {
// private static String ROUTINES_SQL
// =
// "SELECT SPECIFIC_NAME, ROUTINE_COMMENT, ROUTINE_DEFINITION FROM information_schema.routines WHERE "
// + "routine_type = '%s' AND ROUTINE_SCHEMA ='%s' AND "
// + "routine_name = '%s';";
//
// @Override
// public Function function(Connection connection, @NotEmpty String databaseName, String schemaName,
// String functionName) {
//
// String sql = String.format(ROUTINES_SQL, "FUNCTION", databaseName, functionName);
// return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
// Function function = new Function();
// function.setDatabaseName(databaseName);
// function.setSchemaName(schemaName);
// function.setFunctionName(functionName);
// if (resultSet.next()) {
// function.setSpecificName(resultSet.getString("SPECIFIC_NAME"));
// function.setRemarks(resultSet.getString("ROUTINE_COMMENT"));
// function.setFunctionBody(resultSet.getString("ROUTINE_DEFINITION"));
// }
// return function;
// });
//
// }
//
// private static String TRIGGER_SQL
// = "SELECT TRIGGER_NAME,EVENT_MANIPULATION, ACTION_STATEMENT FROM INFORMATION_SCHEMA.TRIGGERS where "
// + "TRIGGER_SCHEMA = '%s' AND TRIGGER_NAME = '%s';";
//
// private static String TRIGGER_SQL_LIST
// = "SELECT TRIGGER_NAME FROM INFORMATION_SCHEMA.TRIGGERS where TRIGGER_SCHEMA = '%s';";
//
// @Override
// public List<Trigger> triggers(Connection connection, String databaseName, String schemaName) {
// List<Trigger> triggers = new ArrayList<>();
// String sql = String.format(TRIGGER_SQL_LIST, databaseName);
// return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
// while (resultSet.next()) {
// Trigger trigger = new Trigger();
// trigger.setTriggerName(resultSet.getString("TRIGGER_NAME"));
// trigger.setSchemaName(schemaName);
// trigger.setDatabaseName(databaseName);
// triggers.add(trigger);
// }
// return triggers;
// });
// }
//
// @Override
// public Trigger trigger(Connection connection, @NotEmpty String databaseName, String schemaName,
// String triggerName) {
//
// String sql = String.format(TRIGGER_SQL, databaseName, triggerName);
// return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
// Trigger trigger = new Trigger();
// trigger.setDatabaseName(databaseName);
// trigger.setSchemaName(schemaName);
// trigger.setTriggerName(triggerName);
// if (resultSet.next()) {
// trigger.setTriggerBody(resultSet.getString("ACTION_STATEMENT"));
// }
// return trigger;
// });
// }
//
// @Override
// public Procedure procedure(Connection connection, @NotEmpty String databaseName, String schemaName,
// String procedureName) {
// String sql = String.format(ROUTINES_SQL, "PROCEDURE", databaseName, procedureName);
// return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
// Procedure procedure = new Procedure();
// procedure.setDatabaseName(databaseName);
// procedure.setSchemaName(schemaName);
// procedure.setProcedureName(procedureName);
// if (resultSet.next()) {
// procedure.setSpecificName(resultSet.getString("SPECIFIC_NAME"));
// procedure.setRemarks(resultSet.getString("ROUTINE_COMMENT"));
// procedure.setProcedureBody(resultSet.getString("ROUTINE_DEFINITION"));
// }
// return procedure;
// });
// }
//
// private static String VIEW_SQL
// = "SELECT TABLE_SCHEMA AS DatabaseName, TABLE_NAME AS ViewName, VIEW_DEFINITION AS definition, CHECK_OPTION, "
// + "IS_UPDATABLE FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = '%s' AND TABLE_NAME = '%s';";
//
// @Override
// public Table view(Connection connection, String databaseName, String schemaName, String viewName) {
// String sql = String.format(VIEW_SQL, databaseName, viewName);
// return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
// Table table = new Table();
// table.setDatabaseName(databaseName);
// table.setSchemaName(schemaName);
// table.setName(viewName);
// if (resultSet.next()) {
// table.setDdl(resultSet.getString("definition"));
// }
// return table;
// });
// }
}

View File

@@ -461,7 +461,6 @@ public class SQLExecutor {
return dbVersion;
} catch (Exception e) {
log.error("get db version error", e);
//throw new RuntimeException(e);
}
return "";
}