nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1998 Use DB Enum to determine SQL Scripts

This commit is contained in:
arolfes 2023-02-17 16:15:55 +01:00 committed by Mustapha Zorgati
parent b2be25e2ef
commit 0e52daae4a
2 changed files with 19 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DB.java
View File

@ -9,17 +9,29 @@ import pro.taskana.common.api.exceptions.UnsupportedDatabaseException;
/** Supported versions of databases. */ /** Supported versions of databases. */
public enum DB { public enum DB {
H2("H2", "h2"), H2("H2", "h2", "/sql/h2/schema-detection-h2.sql", "/sql/h2/taskana-schema-h2.sql"),
DB2("DB2", "db2"), DB2("DB2", "db2", "/sql/db2/schema-detection-db2.sql", "/sql/db2/taskana-schema-db2.sql"),
ORACLE("Oracle", "oracle"), ORACLE(
POSTGRES("PostgreSQL", "postgres"); "Oracle",
"oracle",
"/sql/oracle/schema-detection-oracle.sql",
"/sql/oracle/taskana-schema-oracle.sql"),
POSTGRES(
"PostgreSQL",
"postgres",
"/sql/postgres/schema-detection-postgres.sql",
"/sql/postgres/taskana-schema-postgres.sql");
public final String dbProductName; public final String dbProductName;
public final String dbProductId; public final String dbProductId;
public final String detectionScript;
public final String schemaScript;
DB(String dbProductName, String dbProductId) { DB(String dbProductName, String dbProductId, String detectionScript, String schemaScript) {
this.dbProductName = dbProductName; this.dbProductName = dbProductName;
this.dbProductId = dbProductId; this.dbProductId = dbProductId;
this.detectionScript = detectionScript;
this.schemaScript = schemaScript;
} }
public static DB getDB(String dbProductId) { public static DB getDB(String dbProductId) {

45
common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DbSchemaCreator.java
View File

@ -24,19 +24,6 @@ import pro.taskana.common.internal.util.ComparableVersion;
public class DbSchemaCreator { public class DbSchemaCreator {
private static final Logger LOGGER = LoggerFactory.getLogger(DbSchemaCreator.class); private static final Logger LOGGER = LoggerFactory.getLogger(DbSchemaCreator.class);
private static final String SQL = "/sql";
private static final String DB_SCHEMA_H2 = SQL + "/h2/taskana-schema-h2.sql";
private static final String DB_SCHEMA_DETECTION_H2 = SQL + "/h2/schema-detection-h2.sql";
private static final String DB_SCHEMA_DB2 = SQL + "/db2/taskana-schema-db2.sql";
private static final String DB_SCHEMA_DETECTION_DB2 = SQL + "/db2/schema-detection-db2.sql";
private static final String DB_SCHEMA_ORACLE = SQL + "/oracle/taskana-schema-oracle.sql";
private static final String DB_SCHEMA_DETECTION_ORACLE =
SQL + "/oracle/schema-detection-oracle.sql";
private static final String DB_SCHEMA_POSTGRES = SQL + "/postgres/taskana-schema-postgres.sql";
private static final String DB_SCHEMA_DETECTION_POSTGRES =
SQL + "/postgres/schema-detection-postgres.sql";
private final String schemaName; private final String schemaName;
private final StringWriter outWriter = new StringWriter(); private final StringWriter outWriter = new StringWriter();
private final PrintWriter logWriter = new PrintWriter(outWriter); private final PrintWriter logWriter = new PrintWriter(outWriter);
@ -68,7 +55,7 @@ public class DbSchemaCreator {
ScriptRunner runner = getScriptRunnerInstance(connection); ScriptRunner runner = getScriptRunnerInstance(connection);
if (!isSchemaPreexisting(connection, db)) { if (!isSchemaPreexisting(connection, db)) {
String scriptPath = selectDbScriptFileName(db); String scriptPath = db.schemaScript;
InputStream resourceAsStream = DbSchemaCreator.class.getResourceAsStream(scriptPath); InputStream resourceAsStream = DbSchemaCreator.class.getResourceAsStream(scriptPath);
BufferedReader reader = BufferedReader reader =
new BufferedReader(new InputStreamReader(resourceAsStream, StandardCharsets.UTF_8)); new BufferedReader(new InputStreamReader(resourceAsStream, StandardCharsets.UTF_8));
@ -132,34 +119,6 @@ public class DbSchemaCreator {
this.dataSource = dataSource; this.dataSource = dataSource;
} }
private static String selectDbScriptFileName(DB db) {
switch (db) {
case DB2:
return DB_SCHEMA_DB2;
case ORACLE:
return DB_SCHEMA_ORACLE;
case POSTGRES:
return DB_SCHEMA_POSTGRES;
default:
return DB_SCHEMA_H2;
}
}
private static String selectDbSchemaDetectionScript(DB db) {
switch (db) {
case DB2:
return DB_SCHEMA_DETECTION_DB2;
case ORACLE:
return DB_SCHEMA_DETECTION_ORACLE;
case POSTGRES:
return DB_SCHEMA_DETECTION_POSTGRES;
default:
return DB_SCHEMA_DETECTION_H2;
}
}
private ScriptRunner getScriptRunnerInstance(Connection connection) { private ScriptRunner getScriptRunnerInstance(Connection connection) {
ScriptRunner runner = new ScriptRunner(connection); ScriptRunner runner = new ScriptRunner(connection);
runner.setStopOnError(true); runner.setStopOnError(true);
@ -172,7 +131,7 @@ public class DbSchemaCreator {
ScriptRunner runner = getScriptRunnerInstance(connection); ScriptRunner runner = getScriptRunnerInstance(connection);
runner.setErrorLogWriter(errorLogWriter); runner.setErrorLogWriter(errorLogWriter);
String scriptPath = selectDbSchemaDetectionScript(db); String scriptPath = db.detectionScript;
try (InputStream resource = DbSchemaCreator.class.getResourceAsStream(scriptPath); try (InputStream resource = DbSchemaCreator.class.getResourceAsStream(scriptPath);
InputStreamReader inputReader = new InputStreamReader(resource, StandardCharsets.UTF_8); InputStreamReader inputReader = new InputStreamReader(resource, StandardCharsets.UTF_8);
BufferedReader reader = new BufferedReader(inputReader)) { BufferedReader reader = new BufferedReader(inputReader)) {