Skip to content

feat: add Connection constructor and SqlDialect getter to AbstractSqlDialectHelper #815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bercianor merged 4 commits into from
Feb 3, 2026
Merged

feat: add Connection constructor and SqlDialect getter to AbstractSqlDialectHelper #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7284103
feat: add Connection constructor and SqlDialect getter to AbstractSql…
bercianor Feb 1, 2026
1d114e7
feat: remove DataSource constructor from AbstractSqlDialectHelper
bercianor Feb 2, 2026
3bca78f
fix: initialize dialectHelper always
bercianor Feb 2, 2026
cc71453
fix: check if dialectHelper is null
bercianor Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .../flamingock-auditstore-sql/src/main/java/io/flamingock/store/sql/internal/SqlAuditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,33 @@ public class SqlAuditor implements LifecycleAuditWriter, AuditReader {
private final DataSource dataSource;
private final String auditTableName;
private final boolean autoCreate;
private final SqlAuditorDialectHelper dialectHelper;
private SqlAuditorDialectHelper dialectHelper = null;

public SqlAuditor(DataSource dataSource, String auditTableName, boolean autoCreate) {
this.dataSource = dataSource;
this.auditTableName = auditTableName;
this.autoCreate = autoCreate;
this.dialectHelper = new SqlAuditorDialectHelper(dataSource);
}

public void initialize() {
if (autoCreate) {
try (Connection conn = dataSource.getConnection();
Statement stmt = conn.createStatement()) {
try (Connection conn = dataSource.getConnection();
Statement stmt = conn.createStatement()) {
this.dialectHelper = new SqlAuditorDialectHelper(conn);
if (autoCreate) {
stmt.executeUpdate(dialectHelper.getCreateTableSqlString(auditTableName));
} catch (SQLException e) {
// Firebird throws an error when table already exists; ignore that specific case
if (dialectHelper.getSqlDialect() == io.flamingock.internal.common.sql.SqlDialect.FIREBIRD) {
int errorCode = e.getErrorCode();
String sqlState = e.getSQLState();
String msg = e.getMessage() != null ? e.getMessage().toLowerCase() : "";
}
} catch (SQLException e) {
// Firebird throws an error when table already exists; ignore that specific case
if (dialectHelper != null && dialectHelper.getSqlDialect() == SqlDialect.FIREBIRD) {
int errorCode = e.getErrorCode();
String sqlState = e.getSQLState();
String msg = e.getMessage() != null ? e.getMessage().toLowerCase() : "";

if (errorCode == 335544351 || "42000".equals(sqlState) || msg.contains("already exists")) {
return;
}
if (errorCode == 335544351 || "42000".equals(sqlState) || msg.contains("already exists")) {
return;
}
throw new RuntimeException("Failed to initialize audit table", e);
}
throw new RuntimeException("Failed to initialize audit table", e);
}
}

Expand All @@ -69,7 +69,7 @@ public Result writeEntry(AuditEntry auditEntry) {
conn = dataSource.getConnection();

// For Informix, ensure autoCommit is enabled for audit writes
if (dialectHelper.getSqlDialect() == SqlDialect.INFORMIX) {
if (dialectHelper != null && dialectHelper.getSqlDialect() == SqlDialect.INFORMIX) {
conn.setAutoCommit(true);
}

Expand Down
6 changes: 3 additions & 3 deletions ...uditstore-sql/src/main/java/io/flamingock/store/sql/internal/SqlAuditorDialectHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import io.flamingock.internal.common.sql.AbstractSqlDialectHelper;
import io.flamingock.internal.common.sql.SqlDialect;

import javax.sql.DataSource;
import java.sql.Connection;

public final class SqlAuditorDialectHelper extends AbstractSqlDialectHelper {

public SqlAuditorDialectHelper(DataSource dataSource) {
super(dataSource);
public SqlAuditorDialectHelper(Connection connection) {
super(connection);
}

public SqlAuditorDialectHelper(SqlDialect dialect) {
Expand Down
5 changes: 2 additions & 3 deletions ...k-auditstore-sql/src/main/java/io/flamingock/store/sql/internal/SqlLockDialectHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@
import io.flamingock.internal.common.sql.SqlDialect;
import io.flamingock.internal.core.external.store.lock.LockStatus;

import javax.sql.DataSource;
import java.sql.*;
import java.time.LocalDateTime;
import java.util.Objects;

public final class SqlLockDialectHelper extends AbstractSqlDialectHelper {

public SqlLockDialectHelper(DataSource dataSource) {
super(dataSource);
public SqlLockDialectHelper(Connection connection) {
super(connection);
}

public SqlLockDialectHelper(SqlDialect dialect) {
Expand Down
40 changes: 20 additions & 20 deletions ...mingock-auditstore-sql/src/main/java/io/flamingock/store/sql/internal/SqlLockService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,37 +32,37 @@ public class SqlLockService implements CommunityLockService {

private final DataSource dataSource;
private final String lockRepositoryName;
private final SqlLockDialectHelper dialectHelper;
private SqlLockDialectHelper dialectHelper = null;

public SqlLockService(DataSource dataSource, String lockRepositoryName) {
this.dataSource = dataSource;
this.lockRepositoryName = lockRepositoryName;
this.dialectHelper = new SqlLockDialectHelper(dataSource);
}

public void initialize(boolean autoCreate) {
if (autoCreate) {
try (Connection conn = dataSource.getConnection();
Statement stmt = conn.createStatement()) {
try (Connection conn = dataSource.getConnection();
Statement stmt = conn.createStatement()) {
this.dialectHelper = new SqlLockDialectHelper(conn);
if (autoCreate) {
stmt.executeUpdate(dialectHelper.getCreateTableSqlString(lockRepositoryName));
} catch (SQLException e) {
// For Informix, ignore "Table or view already exists" error (SQLCODE -310)
if (dialectHelper.getSqlDialect() == SqlDialect.INFORMIX &&
(e.getErrorCode() == -310 || e.getSQLState() != null && e.getSQLState().startsWith("42S01"))) {
return;
}
// Firebird throws an error when table already exists; ignore that specific case
if (dialectHelper.getSqlDialect() == io.flamingock.internal.common.sql.SqlDialect.FIREBIRD) {
int errorCode = e.getErrorCode();
String sqlState = e.getSQLState();
String msg = e.getMessage() != null ? e.getMessage().toLowerCase() : "";
}
} catch (SQLException e) {
// For Informix, ignore "Table or view already exists" error (SQLCODE -310)
if (dialectHelper != null && dialectHelper.getSqlDialect() == SqlDialect.INFORMIX &&
(e.getErrorCode() == -310 || e.getSQLState() != null && e.getSQLState().startsWith("42S01"))) {
return;
}
// Firebird throws an error when table already exists; ignore that specific case
if (dialectHelper != null && dialectHelper.getSqlDialect() == SqlDialect.FIREBIRD) {
int errorCode = e.getErrorCode();
String sqlState = e.getSQLState();
String msg = e.getMessage() != null ? e.getMessage().toLowerCase() : "";

if (errorCode == 335544351 || "42000".equals(sqlState) || msg.contains("already exists")) {
return;
}
if (errorCode == 335544351 || "42000".equals(sqlState) || msg.contains("already exists")) {
return;
}
throw new RuntimeException("Failed to initialize lock table", e);
}
throw new RuntimeException("Failed to initialize lock table", e);
}
}

Expand Down
6 changes: 3 additions & 3 deletions ...rget-system/src/main/java/io/flamingock/targetsystem/sql/SqlAuditMarkerDialectHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import io.flamingock.internal.common.sql.AbstractSqlDialectHelper;
import io.flamingock.internal.common.sql.SqlDialect;

import javax.sql.DataSource;
import java.sql.Connection;

public final class SqlAuditMarkerDialectHelper extends AbstractSqlDialectHelper {

public SqlAuditMarkerDialectHelper(DataSource dataSource) {
super(dataSource);
public SqlAuditMarkerDialectHelper(Connection connection) {
super(connection);
}

public SqlAuditMarkerDialectHelper(SqlDialect dialect) {
Expand Down
6 changes: 5 additions & 1 deletion ...arget-system/src/main/java/io/flamingock/targetsystem/sql/SqlTargetSystemAuditMarker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ public static class Builder {
public Builder(DataSource dataSource, TransactionManager<Connection> txManager) {
this.dataSource = dataSource;
this.txManager = txManager;
this.dialectHelper = new SqlAuditMarkerDialectHelper(dataSource);
}

public Builder withTableName(String tableName) {
Expand All @@ -132,6 +131,11 @@ public Builder withSqlDialect(SqlDialect sqlDialect) {
}

public SqlTargetSystemAuditMarker build() {
try (Connection connection = dataSource.getConnection()) {
this.dialectHelper = new SqlAuditMarkerDialectHelper(connection);
} catch (SQLException ex) {
throw new FlamingockException(ex);
}
if (autoCreate) {
createTableIfNotExists();
}
Expand Down
14 changes: 9 additions & 5 deletions utils/sql-util/src/main/java/io/flamingock/internal/common/sql/AbstractSqlDialectHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,27 @@
*/
package io.flamingock.internal.common.sql;

import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;

public class AbstractSqlDialectHelper {

protected static SqlDialect sqlDialect;

public AbstractSqlDialectHelper(DataSource dataSource) {
public AbstractSqlDialectHelper(SqlDialect sqlDialect) {
this.sqlDialect = sqlDialect;
}

public AbstractSqlDialectHelper(Connection connection) {
try {
sqlDialect = fromDatabaseProductName(dataSource.getConnection().getMetaData().getDatabaseProductName());
sqlDialect = fromDatabaseProductName(connection.getMetaData().getDatabaseProductName());
} catch (SQLException e) {
throw new IllegalStateException("Unable to obtain database product name from DataSource", e);
}
}

public AbstractSqlDialectHelper(SqlDialect sqlDialect) {
this.sqlDialect = sqlDialect;
public SqlDialect getSqlDialect() {
return sqlDialect;
}

private SqlDialect fromDatabaseProductName(String productName) {
Expand Down
Loading