Merge branch '4.3.x'

# Conflicts: # base.pom.xml
liquibase · Apr 20, 2021 · 1adbd69 · 1adbd69
2 parents 4b62438 + a3f4d5d
commit 1adbd69
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,9 @@
 Liquibase Core Changelog
 ===========================================
 
+Changes in version 4.3.4 (2021.04.15)
+- Reverts changes from #1722 because they broke other diffChangeLog/generateChangeLog use cases.
+
 Changes in version 4.3.3 (2021.04.09)
 - Fixes an issue with changelogsync and hub
 - Fixes an issue with diff and NullPointerException (#1631)

diff --git a/liquibase-core/src/main/java/liquibase/diff/output/changelog/DiffToChangeLog.java b/liquibase-core/src/main/java/liquibase/diff/output/changelog/DiffToChangeLog.java
@@ -132,7 +132,7 @@ public void run() {
                             //print changeLog only if there are available changeSets to print instead of printing it always
                             printNew(changeLogSerializer, file);
                         } else {
-            Scope.getCurrentScope().getLog(getClass()).info(file + " exists, appending");
+                            Scope.getCurrentScope().getLog(getClass()).info(file + " exists, appending");
                             ByteArrayOutputStream out = new ByteArrayOutputStream();
                             print(new PrintStream(out, true, LiquibaseConfiguration.getInstance().getConfiguration(GlobalConfiguration.class).getOutputEncoding()), changeLogSerializer);
 
@@ -142,7 +142,7 @@ public void run() {
                             innerXml = innerXml.replaceFirst(DATABASE_CHANGE_LOG_CLOSING_XML_TAG, "");
                             innerXml = innerXml.trim();
                             if ("".equals(innerXml)) {
-                Scope.getCurrentScope().getLog(getClass()).info("No changes found, nothing to do");
+                                Scope.getCurrentScope().getLog(getClass()).info("No changes found, nothing to do");
                                 return;
                             }
 
@@ -177,7 +177,7 @@ public void run() {
                                     randomAccessFile.seek(length);
                                     randomAccessFile.write(
                                             xml.getBytes(LiquibaseConfiguration.getInstance().getConfiguration
-                                            (GlobalConfiguration.class).getOutputEncoding()));
+                                                    (GlobalConfiguration.class).getOutputEncoding()));
                                 }
                             }
 
@@ -494,7 +494,7 @@ public String toString(String obj) {
      */
     protected boolean supportsSortingObjects(Database database) {
         return (database instanceof AbstractDb2Database) || (database instanceof MSSQLDatabase) || (database instanceof
-            OracleDatabase) || database instanceof PostgresDatabase;
+                OracleDatabase) || database instanceof PostgresDatabase;
     }
 
     /**
@@ -659,8 +659,8 @@ public String toString(String obj) {
                         "." + StringUtil.trimToEmpty((String)row.get("REFERENCED_NAME"));
 
                 if (!(tabName.isEmpty() || bName.isEmpty())) {
-                  graph.add(bName.replace("\"", ""), tabName.replace("\"", ""));
-                  graph.add(bName.replace("\"", "").replaceAll("\\s*\\([^)]*\\)\\s*",""),
+                    graph.add(bName.replace("\"", ""), tabName.replace("\"", ""));
+                    graph.add(bName.replace("\"", "").replaceAll("\\s*\\([^)]*\\)\\s*",""),
                             tabName.replace("\"", "").replaceAll("\\s*\\([^)]*\\)\\s*", ""));
                 }
             }
@@ -865,8 +865,8 @@ protected String generateId(Change[] changes) {
                 this.overriddenIdRoot = true;
             }
 
-             if ((changes != null) && (changes.length > 0)) {
-                 desc = " ("+ StringUtil.join(changes, " :: ", new StringUtil.StringUtilFormatter<Change>() {
+            if ((changes != null) && (changes.length > 0)) {
+                desc = " ("+ StringUtil.join(changes, " :: ", new StringUtil.StringUtilFormatter<Change>() {
                     @Override
                     public String toString(Change obj) {
                         return obj.getDescription();