Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for issue #1089 #1090

Merged
merged 1 commit into from Oct 3, 2015
Merged

Fix for issue #1089 #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions ...y-core/src/main/java/org/flywaydb/core/internal/dbsupport/db2/DB2SqlStatementBuilder.java
View file
Open in desktop
Expand Up @@ -33,6 +33,22 @@ public class DB2SqlStatementBuilder extends SqlStatementBuilder {
*/
private String statementStart = "";

@Override
protected String extractAlternateOpenQuote(String token) {
if (token.startsWith("X'")) {
return "X'";
}
return null;
}

@Override
protected String computeAlternateCloseQuote(String openQuote) {
if (openQuote.equals("X'")) {
return "'";
}
return openQuote;
}

@Override
protected Delimiter changeDelimiterIfNecessary(String line, Delimiter delimiter) {
if (StringUtils.countOccurrencesOf(statementStart, " ") < 4) {
Expand Down
16 changes: 16 additions & 0 deletions .../src/main/java/org/flywaydb/core/internal/dbsupport/db2zos/DB2zosSqlStatementBuilder.java
View file
Open in desktop
Expand Up @@ -33,6 +33,22 @@ public class DB2zosSqlStatementBuilder extends SqlStatementBuilder {
*/
private String statementStart = "";

@Override
protected String extractAlternateOpenQuote(String token) {
if (token.startsWith("X'")) {
return "X'";
}
return null;
}

@Override
protected String computeAlternateCloseQuote(String openQuote) {
if (openQuote.equals("X'")) {
return "'";
}
return openQuote;
}

@Override
protected Delimiter changeDelimiterIfNecessary(String line, Delimiter delimiter) {
if (StringUtils.countOccurrencesOf(statementStart, " ") < 4) {
Expand Down
11 changes: 11 additions & 0 deletions ...re/src/main/java/org/flywaydb/core/internal/dbsupport/derby/DerbySqlStatementBuilder.java
View file
Open in desktop
Expand Up @@ -26,6 +26,17 @@ protected String extractAlternateOpenQuote(String token) {
if (token.startsWith("$$")) {
return "$$";
}
if (token.startsWith("X'")) {
return "X'";
}
return null;
}

@Override
protected String computeAlternateCloseQuote(String openQuote) {
if (openQuote.equals("X'")) {
return "'";
}
return openQuote;
}
}
27 changes: 27 additions & 0 deletions ...core/src/test/java/org/flywaydb/core/internal/dbsupport/SqlStatementBuilderSmallTest.java
View file
Open in desktop
Expand Up @@ -15,6 +15,9 @@
*/
package org.flywaydb.core.internal.dbsupport;

import org.flywaydb.core.internal.dbsupport.db2.DB2SqlStatementBuilder;
import org.flywaydb.core.internal.dbsupport.db2zos.DB2zosSqlStatementBuilder;
import org.flywaydb.core.internal.dbsupport.derby.DerbySqlStatementBuilder;
import org.flywaydb.core.internal.dbsupport.h2.H2SqlStatementBuilder;
import org.flywaydb.core.internal.dbsupport.oracle.OracleSqlStatementBuilder;
import org.flywaydb.core.internal.dbsupport.postgresql.PostgreSQLSqlStatementBuilder;
Expand Down Expand Up @@ -128,6 +131,30 @@ public void oracleEndsWithOpenMultilineStringLiteralNoSpace() {
assertFalse(endsWithOpenMultilineStringLiteral(new OracleSqlStatementBuilder(), "SELECT' 'FROM DUAL;"));
}

@Test
public void db2EndsWithOpenMultilineStringLiteral() {
assertFalse(endsWithOpenMultilineStringLiteral(new DB2SqlStatementBuilder(), "SELECT' 'FROM DUAL;"));
assertFalse(endsWithOpenMultilineStringLiteral(new DB2SqlStatementBuilder(), "SELECT '123' FROM DUAL;"));
assertFalse(endsWithOpenMultilineStringLiteral(new DB2SqlStatementBuilder(), "SELECT X'0123' FROM DUAL;"));
assertFalse(endsWithOpenMultilineStringLiteral(new DB2SqlStatementBuilder(), "SELECT X'0123',X'0456' FROM DUAL;"));
}

@Test
public void db2zosEndsWithOpenMultilineStringLiteral() {
assertFalse(endsWithOpenMultilineStringLiteral(new DB2zosSqlStatementBuilder(), "SELECT' 'FROM DUAL;"));
assertFalse(endsWithOpenMultilineStringLiteral(new DB2zosSqlStatementBuilder(), "SELECT '123' FROM DUAL;"));
assertFalse(endsWithOpenMultilineStringLiteral(new DB2zosSqlStatementBuilder(), "SELECT X'0123' FROM DUAL;"));
assertFalse(endsWithOpenMultilineStringLiteral(new DB2zosSqlStatementBuilder(), "SELECT X'0123',X'0456' FROM DUAL;"));
}

@Test
public void derbyEndsWithOpenMultilineStringLiteral() {
assertFalse(endsWithOpenMultilineStringLiteral(new DerbySqlStatementBuilder(), "SELECT' 'FROM DUAL;"));
assertFalse(endsWithOpenMultilineStringLiteral(new DerbySqlStatementBuilder(), "SELECT '123' FROM DUAL;"));
assertFalse(endsWithOpenMultilineStringLiteral(new DerbySqlStatementBuilder(), "SELECT X'0123' FROM DUAL;"));
assertFalse(endsWithOpenMultilineStringLiteral(new DerbySqlStatementBuilder(), "SELECT X'0123',X'0456' FROM DUAL;"));
}

@Test
public void stripDelimiter() {
StringBuilder sql = new StringBuilder("SELECT * FROM t WHERE a = 'Straßenpaß';");
Expand Down