fix: move all DialectHelpers to sql-util

Author: bercianor

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

@@ -19,6 +19,7 @@
 import io.flamingock.internal.common.core.audit.AuditReader;
 import io.flamingock.internal.common.core.audit.AuditTxType;
 import io.flamingock.internal.common.sql.SqlDialect;
+import io.flamingock.internal.common.sql.dialectHelpers.SqlAuditorDialectHelper;
 import io.flamingock.internal.core.external.store.audit.LifecycleAuditWriter;
 import io.flamingock.internal.util.Result;
 

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

@@ -16,6 +16,7 @@
 package io.flamingock.store.sql.internal;
 
 import io.flamingock.internal.common.sql.SqlDialect;
+import io.flamingock.internal.common.sql.dialectHelpers.SqlLockDialectHelper;
 import io.flamingock.internal.core.external.store.lock.LockAcquisition;
 import io.flamingock.internal.core.external.store.lock.LockKey;
 import io.flamingock.internal.core.external.store.lock.LockServiceException;

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

@@ -19,6 +19,7 @@
 import io.flamingock.internal.common.core.audit.AuditEntry;
 import io.flamingock.internal.common.core.audit.AuditTxType;
 import io.flamingock.internal.common.sql.SqlDialect;
+import io.flamingock.internal.common.sql.dialectHelpers.SqlAuditorDialectHelper;
 
 import javax.sql.DataSource;
 import java.sql.*;
@@ -35,7 +36,7 @@
 public class SqlAuditStorage implements AuditStorage {
 
     private final DataSource dataSource;
-    private final SqlDialectHelper dialectHelper;
+    private final SqlAuditorDialectHelper dialectHelper;
     private final String auditTableName;
 
     public SqlAuditStorage(DataSource dataSource) throws SQLException {
@@ -46,7 +47,7 @@ public SqlAuditStorage(DataSource dataSource, String tableName) throws SQLExcept
         this.auditTableName = tableName;
         this.dataSource = dataSource;
         try (Connection conn = dataSource.getConnection()) {
-            this.dialectHelper = new SqlDialectHelper(conn);
+            this.dialectHelper = new SqlAuditorDialectHelper(conn);
         }
     }
 
@@ -147,7 +148,7 @@ public boolean hasAuditEntries() {
     public void clear() {
         try(Connection connection = dataSource.getConnection();
             Statement stmt = connection.createStatement()) {
-            stmt.executeUpdate(dialectHelper.getDeleteAllSqlString(auditTableName));
+            stmt.executeUpdate(String.format("DELETE FROM %s", auditTableName));
         } catch (SQLException e) {
             throw new RuntimeException("Failed to clear audit entries", e);
         }

utils/sql-test-kit/src/main/java/io/flamingock/sql/kit/SqlAuditStorage.java

@@ -17,6 +17,7 @@
 
 import io.flamingock.core.kit.lock.LockStorage;
 import io.flamingock.internal.common.sql.SqlDialect;
+import io.flamingock.internal.common.sql.dialectHelpers.SqlLockDialectHelper;
 import io.flamingock.internal.core.external.store.lock.LockAcquisition;
 import io.flamingock.internal.core.external.store.lock.LockKey;
 import io.flamingock.internal.core.external.store.lock.LockServiceException;
@@ -43,7 +44,7 @@ public class SqlLockStorage implements LockStorage {
     private final String lockTableName;
     private final Map<String, Object> metadata = new ConcurrentHashMap<>();
     private final DataSource dataSource;
-    private final SqlDialectHelper dialectHelper;
+    private final SqlLockDialectHelper dialectHelper;
 
     public SqlLockStorage(DataSource dataSource) throws SQLException {
         this(dataSource, DEFAULT_LOCK_STORE_NAME);
@@ -53,7 +54,7 @@ public SqlLockStorage(DataSource dataSource, String lockTableName) throws SQLExc
         this.lockTableName = lockTableName;
         this.dataSource = dataSource;
         try (Connection conn = dataSource.getConnection()) {
-            this.dialectHelper = new SqlDialectHelper(conn);
+            this.dialectHelper = new SqlLockDialectHelper(conn);
         }
     }
 
@@ -241,7 +242,7 @@ public boolean hasLocks() {
     public void clear() {
         try(Connection connection = dataSource.getConnection();
             Statement stmt = connection.createStatement()) {
-            stmt.executeUpdate(dialectHelper.getDeleteAllSqlString(lockTableName));
+            stmt.executeUpdate(String.format("DELETE FROM %s", lockTableName));
         } catch (SQLException e) {
             throw new RuntimeException("Failed to clear lock entries", e);
         }

utils/sql-test-kit/src/main/java/io/flamingock/sql/kit/SqlLockStorage.java

@@ -19,6 +19,7 @@
 import io.flamingock.core.kit.audit.AuditStorage;
 import io.flamingock.core.kit.lock.LockStorage;
 import io.flamingock.internal.common.sql.SqlDialect;
+import io.flamingock.internal.common.sql.dialectHelpers.SqlTestKitDialectHelper;
 import io.flamingock.internal.core.external.store.CommunityAuditStore;
 
 import javax.sql.DataSource;
@@ -30,13 +31,13 @@
 public class SqlTestKit extends AbstractTestKit {
 
     private final DataSource dataSource;
-    private final SqlDialectHelper dialectHelper;
+    private final SqlTestKitDialectHelper dialectHelper;
 
     public SqlTestKit(AuditStorage auditStorage, LockStorage lockStorage, CommunityAuditStore auditStore, DataSource dataSource) throws SQLException {
         super(auditStorage, lockStorage, auditStore);
         this.dataSource = dataSource;
         try (Connection conn = dataSource.getConnection()) {
-            this.dialectHelper = new SqlDialectHelper(conn);
+            this.dialectHelper = new SqlTestKitDialectHelper(conn);
         }
     }
 

utils/sql-test-kit/src/main/java/io/flamingock/sql/kit/SqlTestKit.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.flamingock.store.sql.internal;
+package io.flamingock.internal.common.sql.dialectHelpers;
 
 import io.flamingock.internal.common.sql.SqlDialectFactory;
 import io.flamingock.internal.common.sql.SqlDialect;
@@ -279,19 +279,36 @@ public String getCreateTableSqlString(String tableName) {
 
     public String getInsertSqlString(String tableName) {
         return String.format(
-                "INSERT INTO %s (" +
-                        "execution_id, stage_id, change_id, author, created_at, state, invoked_class, invoked_method, source_file, metadata, " +
-                        "execution_millis, execution_hostname, error_trace, type, tx_strategy, target_system_id, change_order, recovery_strategy, transaction_flag, system_change" +
-                        ") VALUES (" +
-                        "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?" +
-                        ")", tableName);
+            "INSERT INTO %s (" +
+                "execution_id, stage_id, change_id, author, created_at, state, invoked_class, invoked_method, source_file, metadata, " +
+                "execution_millis, execution_hostname, error_trace, type, tx_strategy, target_system_id, change_order, recovery_strategy, transaction_flag, system_change" +
+                ") VALUES (" +
+                "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?" +
+                ")", tableName);
     }
 
     public String getSelectHistorySqlString(String tableName) {
         return String.format(
-                "SELECT execution_id, stage_id, change_id, author, created_at, state, type, invoked_class, invoked_method, source_file, " +
-                        "execution_millis, execution_hostname, metadata, system_change, error_trace, tx_strategy, target_system_id, change_order, recovery_strategy, transaction_flag " +
-                        "FROM %s ORDER BY id ASC", tableName);
+            "SELECT execution_id, stage_id, change_id, author, created_at, state, type, invoked_class, invoked_method, source_file, " +
+                "execution_millis, execution_hostname, metadata, system_change, error_trace, tx_strategy, target_system_id, change_order, recovery_strategy, transaction_flag " +
+                "FROM %s " +
+                "ORDER BY id ASC", tableName);
+    }
+
+    public String getSelectHistoryByChangeIdSqlString(String tableName) {
+        return String.format(
+            "SELECT execution_id, stage_id, change_id, author, created_at, state, type, invoked_class, invoked_method, source_file, " +
+                "execution_millis, execution_hostname, metadata, system_change, error_trace, tx_strategy, target_system_id, change_order, recovery_strategy, transaction_flag " +
+                "FROM %s " +
+                "WHERE change_id = ? " +
+                "ORDER BY id ASC", tableName);
+    }
+
+    public String getCountByStatusSqlString(String tableName) {
+        return String.format(
+            "SELECT COUNT(change_id) " +
+                "FROM %s " +
+                "WHERE state = ?", tableName);
     }
 
     private String getAutoIncrementType() {