0006164: During an upgrade, log DDL before executing it instead of af…

…terwards
JumpMind · Dec 19, 2023 · 70be27e · 70be27e
1 parent 177afcd
commit 70be27e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/sql/ISqlResultsListener.java b/symmetric-db/src/main/java/org/jumpmind/db/sql/ISqlResultsListener.java
@@ -21,6 +21,8 @@
 package org.jumpmind.db.sql;
 
 public interface ISqlResultsListener {
+    public void sqlBefore(String sql, int lineNumber);
+
     public void sqlApplied(String sql, int rowsUpdated, int rowsRetrieved, int lineNumber);
 
     public void sqlErrored(String sql, SqlException ex, int lineNumber, boolean dropStatement, boolean sequenceCreate);

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/sql/LogSqlResultsListener.java b/symmetric-db/src/main/java/org/jumpmind/db/sql/LogSqlResultsListener.java
@@ -29,6 +29,10 @@ public class LogSqlResultsListener implements ISqlResultsListener {
     public LogSqlResultsListener() {
     }
 
+    public void sqlBefore(String sql, int lineNumber) {
+        log.info("Executing DDL: {}", sql);
+    }
+
     public void sqlErrored(String sql, SqlException ex, int lineNumber, boolean dropStatement,
             boolean sequenceCreate) {
         if (dropStatement || sequenceCreate) {
@@ -39,6 +43,5 @@ public void sqlErrored(String sql, SqlException ex, int lineNumber, boolean drop
     }
 
     public void sqlApplied(String sql, int rowsUpdated, int rowsRetrieved, int lineNumber) {
-        log.info("DDL applied: {}", sql);
     }
 }
diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/JdbcSqlTemplate.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/JdbcSqlTemplate.java
@@ -423,6 +423,9 @@ public Integer execute(Connection con) throws SQLException {
                             .readSqlStatement()) {
                         if (isNotBlank(statement)) {
                             try {
+                                if (resultsListener != null) {
+                                    resultsListener.sqlBefore(statement, statementCount);
+                                }
                                 long startTime = System.currentTimeMillis();
                                 boolean hasResults = stmt.execute(statement);
                                 long endTime = System.currentTimeMillis();