Skip to content

Commit de7b2ac

Browse files
committed
feat: disable hsqldb dialect
1 parent 749c1b6 commit de7b2ac

File tree

9 files changed

+4
-26
lines changed

9 files changed

+4
-26
lines changed

community/flamingock-auditstore-sql/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ dependencies {
2121
testImplementation("org.xerial:sqlite-jdbc:3.41.2.1")
2222
testImplementation("com.ibm.informix:jdbc:4.50.10")
2323
testImplementation("org.firebirdsql.jdbc:jaybird:4.0.10.java8")
24-
testImplementation("org.hsqldb:hsqldb:2.7.2")
2524
}
2625

2726
description = "SQL audit store implementation for distributed change auditing"

community/flamingock-auditstore-sql/src/main/java/io/flamingock/community/sql/internal/SqlAuditorDialectHelper.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public String getCreateTableSqlString(String tableName) {
3535
case MYSQL:
3636
case MARIADB:
3737
case H2:
38-
case HSQLDB:
3938
return String.format(
4039
"CREATE TABLE IF NOT EXISTS %s (" +
4140
"id %s PRIMARY KEY, " +
@@ -293,7 +292,6 @@ private String getAutoIncrementType() {
293292
return "BIGSERIAL";
294293
case SQLITE:
295294
case H2:
296-
case HSQLDB:
297295
case DB2:
298296
case FIREBIRD:
299297
return "BIGINT GENERATED BY DEFAULT AS IDENTITY";
@@ -318,7 +316,6 @@ private String getClobType() {
318316
return "LONGTEXT";
319317
case SQLITE:
320318
case H2:
321-
case HSQLDB:
322319
case FIREBIRD:
323320
case INFORMIX:
324321
case ORACLE:
@@ -349,7 +346,6 @@ private String getBooleanType() {
349346
return "TINYINT(1)";
350347
case POSTGRESQL:
351348
case H2:
352-
case HSQLDB:
353349
case FIREBIRD:
354350
case INFORMIX:
355351
return "BOOLEAN";

community/flamingock-auditstore-sql/src/main/java/io/flamingock/community/sql/internal/SqlLockDialectHelper.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ public String getCreateTableSqlString(String tableName) {
5757
case MARIADB:
5858
case SQLITE:
5959
case H2:
60-
case HSQLDB:
6160
return String.format(
6261
"CREATE TABLE IF NOT EXISTS %s (" +
6362
"`key` VARCHAR(255) PRIMARY KEY," +
@@ -190,7 +189,6 @@ public String getInsertOrUpdateLockSqlString(String tableName) {
190189
"WHEN NOT MATCHED THEN INSERT (\"key\", status, owner, expires_at) VALUES (s.\"key\", s.status, s.owner, s.expires_at)",
191190
tableName);
192191
case H2:
193-
case HSQLDB:
194192
return String.format(
195193
"MERGE INTO %s (`key`, status, owner, expires_at) KEY (`key`) VALUES (?, ?, ?, ?)",
196194
tableName);

community/flamingock-auditstore-sql/src/test/java/io/flamingock/community/sql/SqlAuditTestHelper.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ private static String getCreateTestTableSql(SqlDialect dialect) {
7575
case MARIADB:
7676
case SQLITE:
7777
case H2:
78-
case HSQLDB:
7978
case FIREBIRD:
8079
return "CREATE TABLE test_table (" +
8180
"id VARCHAR(255) PRIMARY KEY, " +
@@ -114,7 +113,6 @@ private static String getCreateLockTableSql(SqlDialect dialect) {
114113
case MARIADB:
115114
case SQLITE:
116115
case H2:
117-
case HSQLDB:
118116
return "CREATE TABLE flamingockLock (" +
119117
"`key` VARCHAR(255) PRIMARY KEY, " +
120118
"status VARCHAR(32), " +
@@ -203,7 +201,6 @@ private static String getIndexCheckSql(SqlDialect dialect) {
203201
case FIREBIRD:
204202
return "SELECT RDB$INDEX_NAME FROM RDB$INDICES WHERE RDB$INDEX_NAME = ?";
205203
case H2:
206-
case HSQLDB:
207204
default:
208205
return "SELECT INDEX_NAME FROM INFORMATION_SCHEMA.INDEXES WHERE INDEX_NAME = ?";
209206
}
@@ -233,7 +230,6 @@ public static void verifyIndexExists(TestContext context) throws SQLException {
233230
ps.setString(1, "idx_standalone_index");
234231
break;
235232
case H2:
236-
case HSQLDB:
237233
ps.setString(1, "IDX_STANDALONE_INDEX");
238234
break;
239235
case POSTGRESQL:

core/target-systems/sql-target-system/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ dependencies {
1616
testImplementation("com.oracle.database.jdbc:ojdbc8:23.2.0.0")
1717
testImplementation("org.xerial:sqlite-jdbc:3.50.3.0")
1818
testImplementation("com.h2database:h2:2.2.220")
19-
testImplementation("org.hsqldb:hsqldb:2.5.2")
2019
testImplementation("org.apache.derby:derbytools:10.15.2.0")
2120
testImplementation("org.firebirdsql.jdbc:jaybird:5.0.10.java8")
2221
testImplementation("org.testcontainers:junit-jupiter:1.18.3")

core/target-systems/sql-target-system/src/main/java/io/flamingock/targetsystem/sql/SqlAuditMarkerDialectHelper.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@ public String getMarkSqlString(String tableName) {
7777
return String.format(
7878
"MERGE INTO %s (task_id, operation) KEY (task_id) VALUES (?, ?)",
7979
tableName);
80-
case HSQLDB:
81-
return String.format(
82-
"MERGE INTO %s AS t USING (VALUES(?,?)) AS s(task_id,operation) ON t.task_id = s.task_id " +
83-
"WHEN MATCHED THEN UPDATE SET t.operation = s.operation WHEN NOT MATCHED THEN INSERT (task_id, operation) VALUES (s.task_id, s.operation)",
84-
tableName);
8580
case INFORMIX:
8681
return String.format(
8782
"INSERT INTO %s (task_id, operation) VALUES (?, ?) ON DUPLICATE KEY UPDATE operation = ?",
@@ -98,7 +93,6 @@ public String getCreateTableSqlString(String tableName) {
9893
case POSTGRESQL:
9994
case SQLITE:
10095
case H2:
101-
case HSQLDB:
10296
case SQLSERVER:
10397
case SYBASE:
10498
case FIREBIRD:

core/target-systems/sql-target-system/src/test/java/io/flamingock/targetsystem/sql/SqlAuditMarkerDialectHelperTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,6 @@ private void initForDialect(SqlDialect dialect, JdbcDatabaseContainer<?> contain
9898
config.setPassword("");
9999
config.setDriverClassName("org.sqlite.JDBC");
100100
break;
101-
case HSQLDB:
102-
config.setJdbcUrl("jdbc:hsqldb:mem:testdb");
103-
config.setUsername("testuser");
104-
config.setPassword("");
105-
config.setDriverClassName("org.hsqldb.jdbc.JDBCDriver");
106-
break;
107101
case DB2:
108102
config.setJdbcUrl("jdbc:h2:mem:testdb;MODE=DB2;DB_CLOSE_DELAY=-1");
109103
config.setUsername("testuser");

utils/sql-util/src/main/java/io/flamingock/internal/common/sql/AbstractSqlDialectHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ private SqlDialect fromDatabaseProductName(String productName) {
4949
return SqlDialect.SQLITE;
5050
} else if (v.contains("h2")) {
5151
return SqlDialect.H2;
52-
} else if (v.contains("hsql")) {
52+
/*} else if (v.contains("hsql")) {
5353
return SqlDialect.HSQLDB;
54+
*/
5455
} else if (v.contains("sql server")) {
5556
return SqlDialect.SQLSERVER;
5657
} else if (v.contains("sybase") || v.contains("adaptive server")) {

utils/sql-util/src/main/java/io/flamingock/internal/common/sql/SqlDialect.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public enum SqlDialect {
2121
POSTGRESQL,
2222
SQLITE,
2323
H2,
24-
HSQLDB,
24+
//TODO implement
25+
//HSQLDB,
2526
SQLSERVER,
2627
SYBASE,
2728
FIREBIRD,

0 commit comments

Comments
 (0)