Fixes JdbcExecutor's uses of RawParameterizedSqlStatement

Adds a private method, setParameters, to set parameters from RawParameterizedSqlStatement to PreparedStatement. Replaces parameters loop in execute with setParameters. Replaces parameters loop in query with setParameters.
liquibase · Aug 18, 2023 · 32a0e09 · 32a0e09
1 parent 0101b8c
commit 32a0e09
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/liquibase-standard/src/main/java/liquibase/executor/jvm/JdbcExecutor.java b/liquibase-standard/src/main/java/liquibase/executor/jvm/JdbcExecutor.java
@@ -153,10 +153,7 @@ public void execute(final SqlStatement sql, final List<SqlVisitor> sqlVisitors)
             String finalSql = applyVisitors((RawParameterizedSqlStatement) sql, sqlVisitors);
 
             try (PreparedStatement pstmt = factory.create(finalSql)) {
-                final List<?> parameters = ((RawParameterizedSqlStatement) sql).getParameters();
-                for (int i = 0; i < parameters.size(); i++) {
-                    pstmt.setObject(i, parameters.get(i));
-                }
+                setParameters(pstmt, (RawParameterizedSqlStatement) sql);
                 pstmt.execute();
 
                 return;
@@ -180,6 +177,13 @@ public void execute(final SqlStatement sql, final List<SqlVisitor> sqlVisitors)
         execute(new ExecuteStatementCallback(sql, sqlVisitors), sqlVisitors);
     }
 
+    private void setParameters(final PreparedStatement pstmt, final RawParameterizedSqlStatement sql) throws SQLException {
+        final List<?> parameters = sql.getParameters();
+        for (int i = 0; i < parameters.size(); i++) {
+            pstmt.setObject(i + 1, parameters.get(i));
+        }
+    }
+
     private String applyVisitors(RawParameterizedSqlStatement sql, List<SqlVisitor> sqlVisitors) {
         String finalSql = sql.getSql();
         if (sqlVisitors != null) {
@@ -204,10 +208,7 @@ public Object query(final SqlStatement sql, final ResultSetExtractor rse, final
             String finalSql = applyVisitors((RawParameterizedSqlStatement) sql, sqlVisitors);
 
             try (PreparedStatement pstmt = factory.create(finalSql)) {
-                final List<?> parameters = ((RawParameterizedSqlStatement) sql).getParameters();
-                for (int i = 0; i < parameters.size(); i++) {
-                    pstmt.setObject(i, parameters.get(0));
-                }
+                setParameters(pstmt, (RawParameterizedSqlStatement) sql);
                 return rse.extractData(pstmt.executeQuery());
             } catch (SQLException e) {
                 throw new DatabaseException(e);