Fix #3174: clean schemas before dropping them

flyway · May 18, 2021 · 3f6eda9 · 3f6eda9
1 parent c5e576d
commit 3f6eda9
Showing 1 changed file with 22 additions and 46 deletions.
diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/command/DbClean.java b/flyway-core/src/main/java/org/flywaydb/core/internal/command/DbClean.java
@@ -31,31 +31,16 @@
 import org.flywaydb.core.internal.util.StopWatch;
 import org.flywaydb.core.internal.util.TimeFormat;
 
-/**
- * Main workflow for cleaning the database.
- */
 public class DbClean {
     private static final Log LOG = LogFactory.getLog(DbClean.class);
 
-    /**
-     * The schemas to clean.
-     */
     private final Schema[] schemas;
     private final Connection connection;
-    private Database database;
+    private final Database database;
     private final SchemaHistory schemaHistory;
     private final CallbackExecutor callbackExecutor;
-    private boolean cleanDisabled;
+    private final boolean cleanDisabled;
 
-    /**
-     * Creates a new database cleaner.
-     *
-     * @param database         The DB support for the connection.
-     * @param schemaHistory    The schema history table.
-     * @param schemas          The schemas to clean.
-     * @param callbackExecutor The callback executor.
-     * @param cleanDisabled    Whether to disable clean.
-     */
     public DbClean(Database database, SchemaHistory schemaHistory, Schema[] schemas, CallbackExecutor callbackExecutor, boolean cleanDisabled) {
         this.database = database;
         this.connection = database.getMainConnection();
@@ -65,21 +50,18 @@ public DbClean(Database database, SchemaHistory schemaHistory, Schema[] schemas,
         this.cleanDisabled = cleanDisabled;
     }
 
-    /**
-     * Cleans the schemas of all objects.
-     *
-     * @throws FlywayException When clean failed.
-     */
     public CleanResult clean() throws FlywayException {
         if (cleanDisabled) {
             throw new FlywayException("Unable to execute clean as it has been disabled with the \"flyway.cleanDisabled\" property.");
         }
+
         callbackExecutor.onEvent(Event.BEFORE_CLEAN);
 
         CleanResult cleanResult = CommandResultFactory.createCleanResult(database.getCatalog());
 
         try {
             connection.changeCurrentSchemaTo(schemas[0]);
+
             boolean dropSchemas = false;
             try {
                 dropSchemas = schemaHistory.hasSchemasMarker();
@@ -98,14 +80,24 @@ public CleanResult clean() throws FlywayException {
                 }
 
                 if (dropSchemas) {
-                    dropSchema(schema, cleanResult);
+                    try {
+                        cleanSchema(schema);
+                    } catch (FlywayException e) {
+                        // ignore as we drop schemas later
+                    }
                 } else {
                     cleanSchema(schema);
                     cleanResult.schemasCleaned.add(schema.getName());
                 }
             }
 
             dropDatabaseObjectsPostSchemas();
+
+            if (dropSchemas) {
+                for (Schema schema : schemas) {
+                    dropSchema(schema, cleanResult);
+                }
+            }
         } catch (FlywayException e) {
             callbackExecutor.onEvent(Event.AFTER_CLEAN_ERROR);
             throw e;
@@ -119,8 +111,6 @@ public CleanResult clean() throws FlywayException {
 
     /**
      * Drops database-level objects that need to be cleaned prior to schema-level objects.
-     *
-     * @throws FlywayException When the drop failed.
      */
     private void dropDatabaseObjectsPreSchemas() {
         LOG.debug("Dropping pre-schema database level objects...");
@@ -142,8 +132,6 @@ private void dropDatabaseObjectsPreSchemas() {
 
     /**
      * Drops database-level objects that need to be cleaned after all schema-level objects.
-     *
-     * @throws FlywayException When the drop failed.
      */
     private void dropDatabaseObjectsPostSchemas() {
         LOG.debug("Dropping post-schema database level objects...");
@@ -163,40 +151,28 @@ private void dropDatabaseObjectsPostSchemas() {
                 TimeFormat.format(stopWatch.getTotalTimeMillis())));
     }
 
-    /**
-     * Drops this schema.
-     *
-     * @throws FlywayException When the drop failed.
-     */
     private void dropSchema(final Schema schema, CleanResult cleanResult) {
-        LOG.debug("Dropping schema " + schema + " ...");
+        LOG.debug("Dropping schema " + schema + "...");
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
         try {
             ExecutionTemplateFactory.createExecutionTemplate(connection.getJdbcConnection(), database).execute(() -> {
                 schema.drop();
                 return null;
             });
+
             cleanResult.schemasDropped.add(schema.getName());
+
+            stopWatch.stop();
+            LOG.info(String.format("Successfully dropped schema %s (execution time %s)",
+                    schema, TimeFormat.format(stopWatch.getTotalTimeMillis())));
         } catch (FlywaySqlException e) {
             LOG.debug(e.getMessage());
-            LOG.warn("Unable to drop schema " + schema + ". Attempting clean instead...");
-            ExecutionTemplateFactory.createExecutionTemplate(connection.getJdbcConnection(), database).execute(() -> {
-                schema.clean();
-                return null;
-            });
+            LOG.warn("Unable to drop schema " + schema + ". It was cleaned instead.");
             cleanResult.schemasCleaned.add(schema.getName());
         }
-        stopWatch.stop();
-        LOG.info(String.format("Successfully dropped schema %s (execution time %s)",
-                schema, TimeFormat.format(stopWatch.getTotalTimeMillis())));
     }
 
-    /**
-     * Cleans this schema of all objects.
-     *
-     * @throws FlywayException When clean failed.
-     */
     private void cleanSchema(final Schema schema) {
         LOG.debug("Cleaning schema " + schema + " ...");
         StopWatch stopWatch = new StopWatch();