Correctly close referenceDatabase

liquibase · Jul 20, 2022 · 97b474b · 97b474b
1 parent ad64480
commit 97b474b
Showing 1 changed file with 50 additions and 49 deletions.
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDatabaseDiff.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDatabaseDiff.java
@@ -231,61 +231,62 @@ protected void performLiquibaseTask(Liquibase liquibase) throws LiquibaseExcepti
 
         Database db = liquibase.getDatabase();
 
-        Database referenceDatabase = CommandLineUtils.createDatabaseObject(resourceAccessor, referenceUrl, referenceUsername, referencePassword, referenceDriver, referenceDefaultCatalogName, referenceDefaultSchemaName, outputDefaultCatalog, outputDefaultSchema, null, null, propertyProviderClass, null, null, databaseChangeLogTableName, databaseChangeLogLockTableName);
+        try (Database referenceDatabase = CommandLineUtils.createDatabaseObject(resourceAccessor, referenceUrl, referenceUsername, referencePassword, referenceDriver, referenceDefaultCatalogName, referenceDefaultSchemaName, outputDefaultCatalog, outputDefaultSchema, null, null, propertyProviderClass, null, null, databaseChangeLogTableName, databaseChangeLogLockTableName)) {
 
-        getLog().info("Performing Diff on database " + db.toString());
-        if ((diffExcludeObjects != null) && (diffIncludeObjects != null)) {
-            throw new UnexpectedLiquibaseException("Cannot specify both excludeObjects and includeObjects");
-        }
-        ObjectChangeFilter objectChangeFilter = null;
-        if (diffExcludeObjects != null) {
-            objectChangeFilter = new StandardObjectChangeFilter(StandardObjectChangeFilter.FilterType.EXCLUDE, diffExcludeObjects);
-        }
-        if (diffIncludeObjects != null) {
-            objectChangeFilter = new StandardObjectChangeFilter(StandardObjectChangeFilter.FilterType.INCLUDE, diffIncludeObjects);
-        }
-
-        CompareControl.SchemaComparison[] schemaComparisons = createSchemaComparisons(db);
-        if (diffChangeLogFile != null) {
-            try {
-                DiffOutputControl diffOutputControl = new DiffOutputControl(diffIncludeCatalog, diffIncludeSchema, diffIncludeTablespace, null).addIncludedSchema(new CatalogAndSchema(referenceDefaultCatalogName, referenceDefaultSchemaName));
-                diffOutputControl.setObjectChangeFilter(objectChangeFilter);
-                CommandLineUtils.doDiffToChangeLog(diffChangeLogFile, referenceDatabase, db, diffOutputControl,
-                                                   objectChangeFilter, StringUtil.trimToNull(diffTypes), schemaComparisons);
-                if (new File(diffChangeLogFile).exists()) {
-                    getLog().info("Differences written to Change Log File, " + diffChangeLogFile);
-                }
-            } catch (IOException | ParserConfigurationException e) {
-                throw new LiquibaseException(e);
+            getLog().info("Performing Diff on database " + db.toString());
+            if ((diffExcludeObjects != null) && (diffIncludeObjects != null)) {
+                throw new UnexpectedLiquibaseException("Cannot specify both excludeObjects and includeObjects");
+            }
+            ObjectChangeFilter objectChangeFilter = null;
+            if (diffExcludeObjects != null) {
+                objectChangeFilter = new StandardObjectChangeFilter(StandardObjectChangeFilter.FilterType.EXCLUDE, diffExcludeObjects);
+            }
+            if (diffIncludeObjects != null) {
+                objectChangeFilter = new StandardObjectChangeFilter(StandardObjectChangeFilter.FilterType.INCLUDE, diffIncludeObjects);
             }
-        } else {
-            PrintStream printStream = createPrintStream();
-            if (isFormattedDiff()) {
-                CommandScope liquibaseCommand = new CommandScope("internalDiff");
-                CommandScope diffCommand =
-                        CommandLineUtils.createDiffCommand(referenceDatabase, db, StringUtil.trimToNull(diffTypes),
-                                schemaComparisons, objectChangeFilter, printStream);
-                CompareControl compareControl = new CompareControl(schemaComparisons, diffTypes);
 
-                liquibaseCommand.addArgumentValue("format", format);
-                liquibaseCommand.addArgumentValue("diffCommand", diffCommand);
-                liquibaseCommand.addArgumentValue("targetDatabase", db);
-                liquibaseCommand.addArgumentValue("referenceDatabase", referenceDatabase);
-                liquibaseCommand.addArgumentValue("compareControl", compareControl);
-                liquibaseCommand.addArgumentValue("objectChangeFilter", objectChangeFilter);
-                if (StringUtil.isEmpty(diffTypes)) {
-                    liquibaseCommand.addArgumentValue("snapshotTypes", new Class[0]);
-                } else {
-                    liquibaseCommand.addArgumentValue("snapshotTypes", diffTypes);
+            CompareControl.SchemaComparison[] schemaComparisons = createSchemaComparisons(db);
+            if (diffChangeLogFile != null) {
+                try {
+                    DiffOutputControl diffOutputControl = new DiffOutputControl(diffIncludeCatalog, diffIncludeSchema, diffIncludeTablespace, null).addIncludedSchema(new CatalogAndSchema(referenceDefaultCatalogName, referenceDefaultSchemaName));
+                    diffOutputControl.setObjectChangeFilter(objectChangeFilter);
+                    CommandLineUtils.doDiffToChangeLog(diffChangeLogFile, referenceDatabase, db, diffOutputControl,
+                            objectChangeFilter, StringUtil.trimToNull(diffTypes), schemaComparisons);
+                    if (new File(diffChangeLogFile).exists()) {
+                        getLog().info("Differences written to Change Log File, " + diffChangeLogFile);
+                    }
+                } catch (IOException | ParserConfigurationException e) {
+                    throw new LiquibaseException(e);
                 }
+            } else {
+                PrintStream printStream = createPrintStream();
+                if (isFormattedDiff()) {
+                    CommandScope liquibaseCommand = new CommandScope("internalDiff");
+                    CommandScope diffCommand =
+                            CommandLineUtils.createDiffCommand(referenceDatabase, db, StringUtil.trimToNull(diffTypes),
+                                    schemaComparisons, objectChangeFilter, printStream);
+                    CompareControl compareControl = new CompareControl(schemaComparisons, diffTypes);
 
-                CommandScope formattedDiffCommand = new CommandScope("internalFormattedDiff");
-                formattedDiffCommand.addArgumentValue("format", format);
-                formattedDiffCommand.addArgumentValue("diffCommand", liquibaseCommand);
+                    liquibaseCommand.addArgumentValue("format", format);
+                    liquibaseCommand.addArgumentValue("diffCommand", diffCommand);
+                    liquibaseCommand.addArgumentValue("targetDatabase", db);
+                    liquibaseCommand.addArgumentValue("referenceDatabase", referenceDatabase);
+                    liquibaseCommand.addArgumentValue("compareControl", compareControl);
+                    liquibaseCommand.addArgumentValue("objectChangeFilter", objectChangeFilter);
+                    if (StringUtil.isEmpty(diffTypes)) {
+                        liquibaseCommand.addArgumentValue("snapshotTypes", new Class[0]);
+                    } else {
+                        liquibaseCommand.addArgumentValue("snapshotTypes", diffTypes);
+                    }
 
-                formattedDiffCommand.execute();
-            } else {
-                CommandLineUtils.doDiff(referenceDatabase, db, StringUtil.trimToNull(diffTypes), schemaComparisons, objectChangeFilter, printStream);
+                    CommandScope formattedDiffCommand = new CommandScope("internalFormattedDiff");
+                    formattedDiffCommand.addArgumentValue("format", format);
+                    formattedDiffCommand.addArgumentValue("diffCommand", liquibaseCommand);
+
+                    formattedDiffCommand.execute();
+                } else {
+                    CommandLineUtils.doDiff(referenceDatabase, db, StringUtil.trimToNull(diffTypes), schemaComparisons, objectChangeFilter, printStream);
+                }
             }
         }
     }