Add a 2-pass approach to cleaning SQL Server indexes

flyway · Mar 9, 2021 · 7f492a5 · 7f492a5
1 parent 9033185
commit 7f492a5
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/database/sqlserver/SQLServerSchema.java b/flyway-core/src/main/java/org/flywaydb/core/internal/database/sqlserver/SQLServerSchema.java
@@ -232,8 +232,14 @@ protected void doClean() throws SQLException {
             jdbcTemplate.execute(statement);
         }
 
+        // Use a 2-pass approach for cleaning indexes that cannot be dropped until the corresponding table is dropped
+        // Pass 1
         for (String statement : cleanIndexes(tables)) {
-            jdbcTemplate.execute(statement);
+            try {
+                jdbcTemplate.execute(statement);
+            } catch (SQLException e) {
+                LOG.debug("Ignoring dropping index. Error: " + e.getMessage());
+            }
         }
 
         // Use a 2-pass approach for cleaning computed columns and functions with SCHEMABINDING due to dependency errors
@@ -258,7 +264,7 @@ protected void doClean() throws SQLException {
             }
         }
 
-        // Pass 2
+        // Pass 2 for cleaning computed columns and functions
         for (String statement : cleanComputedColumns(tables)) {
             jdbcTemplate.execute(statement);
         }
@@ -290,6 +296,11 @@ protected void doClean() throws SQLException {
             table.drop();
         }
 
+        // Pass 2 for cleaning indexes
+        for (String statement : cleanIndexes(tables)) {
+            jdbcTemplate.execute(statement);
+        }
+
         for (String statement : cleanObjects("AGGREGATE", ObjectType.AGGREGATE)) {
             jdbcTemplate.execute(statement);
         }