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

support backtick enquoting in SQL script splitter #8593

Merged
merged 2 commits into from
May 6, 2024
Merged

support backtick enquoting in SQL script splitter #8593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4f9c31
support backtick enquoting in SQL script splitter
peterhalicky May 3, 2024
daf11d4
apply spotless
peterhalicky May 6, 2024
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
7 changes: 6 additions & 1 deletion modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,12 @@ Lexem next() {
return Lexem.SEPARATOR;
} else if (matchesSingleLineComment() || matchesMultilineComment()) {
return Lexem.COMMENT;
} else if (matchesQuotedString('\'') || matchesQuotedString('"') || matchesDollarQuotedString()) {
} else if (
matchesQuotedString('\'') ||
matchesQuotedString('"') ||
matchesQuotedString('`') ||
matchesDollarQuotedString()
) {
return Lexem.QUOTED_STRING;
} else if (matches(identifier)) {
return Lexem.IDENTIFIER;
Expand Down
9 changes: 9 additions & 0 deletions modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ public void testIssue1547Case2() {
splitAndCompare(script, expected);
}

@Test
public void testSplittingEnquotedSemicolon() {
String script = "CREATE TABLE `bar;bar` (\n" + " end_time VARCHAR(255)\n" + ");";

List<String> expected = Arrays.asList("CREATE TABLE `bar;bar` ( end_time VARCHAR(255) )");

splitAndCompare(script, expected);
}

@Test
public void testUnusualSemicolonPlacement() {
String script = "SELECT 1;;;;;SELECT 2;\n;SELECT 3\n; SELECT 4;\n SELECT 5";
Expand Down