Merge pull request #1461 from liquibase/LB-209

Fix issue with formatted SQL overwriting first changeset during diffToChangeLog LB-209
liquibase · Oct 9, 2020 · aae1f01 · aae1f01
2 parents 66277fe + 1291438
commit aae1f01
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/database/core/PostgresDatabase.java b/liquibase-core/src/main/java/liquibase/database/core/PostgresDatabase.java
@@ -402,8 +402,10 @@ public DbTypes getDbType() {
         try {
             enterpriseDb = getDatabaseFullVersion().toLowerCase().contains("enterprisedb");
         } catch (DatabaseException e) {
-            Scope.getCurrentScope().getLog(getClass()).severe("Can't get full version of Postgres DB. Used EDB as default", e);
-            return  DbTypes.EDB;
+            if (getConnection() != null) {
+                Scope.getCurrentScope().getLog(getClass()).severe("Can't get full version of Postgres DB. Used EDB as default", e);
+                return DbTypes.EDB;
+            }
         }
         return enterpriseDb ? DbTypes.EDB : DbTypes.COMMUNITY;
     }

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
@@ -165,10 +165,12 @@ public void run() {
                                     randomAccessFile.writeBytes(DATABASE_CHANGE_LOG_CLOSING_XML_TAG + lineSeparator);
                                 } else {
                                     randomAccessFile.seek(0);
-                                    randomAccessFile.write(xml.getBytes(LiquibaseConfiguration.getInstance().getConfiguration
+                                    long length = randomAccessFile.length();
+                                    randomAccessFile.seek(length);
+                                    randomAccessFile.write(
+                                            xml.getBytes(LiquibaseConfiguration.getInstance().getConfiguration
                                             (GlobalConfiguration.class).getOutputEncoding()));
                                 }
-                                randomAccessFile.close();
                             }
 
                         }