Fixed flyway#2029: Regression in 5.1.0 regarding non-transactional mi…

…grations including comments
dohrayme · May 28, 2018 · afd3229 · afd3229
1 parent 7938871
commit afd3229
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/...ay-core/src/main/java/org/flywaydb/core/internal/database/db2/DB2SqlStatementBuilder.java b/...ay-core/src/main/java/org/flywaydb/core/internal/database/db2/DB2SqlStatementBuilder.java
@@ -101,7 +101,7 @@ protected Delimiter changeDelimiterIfNecessary(String line, Delimiter delimiter)
             currentDelimiter = delimiter;
         }
 
-        if (StringUtils.countOccurrencesOf(statementStart, " ") < 4) {
+        if (hasNonCommentPart() && StringUtils.countOccurrencesOf(statementStart, " ") < 4) {
             statementStart += line;
             statementStart += " ";
         }

diff --git a/...in/java/org/flywaydb/core/internal/database/postgresql/PostgreSQLSqlStatementBuilder.java b/...in/java/org/flywaydb/core/internal/database/postgresql/PostgreSQLSqlStatementBuilder.java
@@ -90,7 +90,7 @@ protected void applyStateChanges(String line) {
 
         super.applyStateChanges(line);
 
-        if (!executeInTransaction) {
+        if (!executeInTransaction || !hasNonCommentPart()) {
             return;
         }
 

diff --git a/...c/main/java/org/flywaydb/core/internal/database/redshift/RedshiftSqlStatementBuilder.java b/...c/main/java/org/flywaydb/core/internal/database/redshift/RedshiftSqlStatementBuilder.java
@@ -46,7 +46,7 @@ public class RedshiftSqlStatementBuilder extends SqlStatementBuilder {
     protected void applyStateChanges(String line) {
         super.applyStateChanges(line);
 
-        if (!executeInTransaction) {
+        if (!executeInTransaction || !hasNonCommentPart()) {
             return;
         }
 

diff --git a/...src/main/java/org/flywaydb/core/internal/database/saphana/SAPHANASqlStatementBuilder.java b/...src/main/java/org/flywaydb/core/internal/database/saphana/SAPHANASqlStatementBuilder.java
@@ -53,9 +53,8 @@ protected String cleanToken(String token) {
 
     @Override
     protected Delimiter changeDelimiterIfNecessary(String line, Delimiter delimiter) {
-
         // need only accumulate 16 characters of normalized statement start in order to determine if it is an 'interesting' statement
-        if (statementStartNormalized.length() < 16) {
+        if (hasNonCommentPart() && statementStartNormalized.length() < 16) {
             final String effectiveLine = cutCommentsFromEnd(line);
             statementStartNormalized += effectiveLine + " ";
             statementStartNormalized = StringUtils.trimLeadingWhitespace(StringUtils.collapseWhitespace(statementStartNormalized));

diff --git a/...e/src/main/java/org/flywaydb/core/internal/database/sqlite/SQLiteSqlStatementBuilder.java b/...e/src/main/java/org/flywaydb/core/internal/database/sqlite/SQLiteSqlStatementBuilder.java
@@ -34,7 +34,7 @@ public class SQLiteSqlStatementBuilder extends SqlStatementBuilder {
 
     @Override
     protected Delimiter changeDelimiterIfNecessary(String line, Delimiter delimiter) {
-        if (StringUtils.countOccurrencesOf(statementStart, " ") < 8) {
+        if (hasNonCommentPart() && StringUtils.countOccurrencesOf(statementStart, " ") < 8) {
             statementStart += line;
             statementStart += " ";
             statementStart = StringUtils.collapseWhitespace(statementStart);

diff --git a/...main/java/org/flywaydb/core/internal/database/sqlserver/SQLServerSqlStatementBuilder.java b/...main/java/org/flywaydb/core/internal/database/sqlserver/SQLServerSqlStatementBuilder.java
@@ -51,7 +51,7 @@ public SQLServerSqlStatementBuilder(Delimiter defaultDelimiter) {
     protected void applyStateChanges(String line) {
         super.applyStateChanges(line);
 
-        if (!executeInTransaction) {
+        if (!executeInTransaction || !hasNonCommentPart()) {
             return;
         }