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

fix: PostgreSQL parser should not treat \ as an escape char #1921

Merged
merged 4 commits into from
Jun 22, 2022
Merged

fix: PostgreSQL parser should not treat \ as an escape char #1921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
571b0b4
fix: PostgreSQL parser should not treat \ as an escape char
olavloite Jun 22, 2022
2b9e376
chore: run formatter
olavloite Jun 22, 2022
28c1e3e
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jun 22, 2022
5fbb0c2
Merge branch 'issue-1920' of https://github.com/googleapis/java-spann…
gcf-owl-bot[bot] Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ...-spanner/src/main/java/com/google/cloud/spanner/connection/PostgreSQLStatementParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ private int skipQuoted(
char startQuote,
String dollarTag,
@Nullable StringBuilder result) {
boolean lastCharWasEscapeChar = false;
int currentIndex = startIndex + 1;
while (currentIndex < sql.length()) {
char currentChar = sql.charAt(currentIndex);
Expand All @@ -238,8 +237,6 @@ private int skipQuoted(
appendIfNotNull(result, currentChar, dollarTag, currentChar);
return currentIndex + tag.length() + 2;
}
} else if (lastCharWasEscapeChar) {
lastCharWasEscapeChar = false;
} else if (sql.length() > currentIndex + 1 && sql.charAt(currentIndex + 1) == startQuote) {
// This is an escaped quote (e.g. 'foo''bar')
appendIfNotNull(result, currentChar);
Expand All @@ -250,8 +247,6 @@ private int skipQuoted(
appendIfNotNull(result, currentChar);
return currentIndex + 1;
}
} else {
lastCharWasEscapeChar = currentChar == '\\';
}
currentIndex++;
appendIfNotNull(result, currentChar);
Expand Down
54 changes: 41 additions & 13 deletions ...-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/StatementParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,34 @@ public void testPostgresSQLDialectDollarQuoted() {
.isEqualTo("SELECT FOO, $BAR \nFROM SOME_TABLE");
}

@Test
public void testPostgreSQLDialectUnicodeEscapedIdentifiers() {
assumeTrue(dialect == Dialect.POSTGRESQL);

assertEquals(
"SELECT 'tricky' AS \"\\\"", parser.removeCommentsAndTrim("SELECT 'tricky' AS \"\\\""));
assertEquals(
"SELECT 'tricky' AS U&\"\\\" UESCAPE '!'",
parser.removeCommentsAndTrim("SELECT 'tricky' AS U&\"\\\" UESCAPE '!'"));
assertEquals(
"SELECT '\\' AS \"tricky\"", parser.removeCommentsAndTrim("SELECT '\\' AS \"tricky\""));
assertEquals("SELECT 'foo''bar'", parser.removeCommentsAndTrim("SELECT 'foo''bar'"));
assertEquals("SELECT 'foo\"bar'", parser.removeCommentsAndTrim("SELECT 'foo\"bar'"));
assertEquals("SELECT 'foo\"\"bar'", parser.removeCommentsAndTrim("SELECT 'foo\"\"bar'"));
assertEquals(
"SELECT 'foo'", parser.removeCommentsAndTrim("SELECT /* This is a 'comment' */ 'foo'"));
assertEquals(
"SELECT 'foo'",
parser.removeCommentsAndTrim("SELECT /* This is a '''comment''' */ 'foo'"));
assertEquals(
"SELECT '''foo''' FROM bar",
parser.removeCommentsAndTrim("SELECT /* This is a '''comment''' */ '''foo''' FROM bar"));
assertEquals(
"SELECT '''foo''' FROM \"\"\"\\bar\\\"\"\"",
parser.removeCommentsAndTrim(
"SELECT /* This is a '''comment''' */ '''foo''' FROM \"\"\"\\bar\\\"\"\""));
}

@Test
public void testPostgreSQLDialectSupportsEmbeddedComments() {
assumeTrue(dialect == Dialect.POSTGRESQL);
Expand Down Expand Up @@ -1109,25 +1137,25 @@ public void testPostgreSQLDialectDialectConvertPositionalParametersToNamedParame
.sqlWithNamedParameters)
.isEqualTo("$1'?test?\"?test?\"?'$2");
assertThat(
parser.convertPositionalParametersToNamedParameters('?', "?'?it\\'?s'?")
parser.convertPositionalParametersToNamedParameters('?', "?'?it\\''?s'?")
.sqlWithNamedParameters)
.isEqualTo("$1'?it\\'?s'$2");
.isEqualTo("$1'?it\\''?s'$2");
assertThat(
parser.convertPositionalParametersToNamedParameters('?', "?'?it\\\"?s'?")
.sqlWithNamedParameters)
.isEqualTo("$1'?it\\\"?s'$2");
assertThat(
parser.convertPositionalParametersToNamedParameters('?', "?\"?it\\\"?s\"?")
parser.convertPositionalParametersToNamedParameters('?', "?\"?it\\\"\"?s\"?")
.sqlWithNamedParameters)
.isEqualTo("$1\"?it\\\"?s\"$2");
.isEqualTo("$1\"?it\\\"\"?s\"$2");
assertThat(
parser.convertPositionalParametersToNamedParameters('?', "?'''?it\\'?s'''?")
parser.convertPositionalParametersToNamedParameters('?', "?'''?it\\''?s'''?")
.sqlWithNamedParameters)
.isEqualTo("$1'''?it\\'?s'''$2");
.isEqualTo("$1'''?it\\''?s'''$2");
assertThat(
parser.convertPositionalParametersToNamedParameters('?', "?\"\"\"?it\\\"?s\"\"\"?")
parser.convertPositionalParametersToNamedParameters('?', "?\"\"\"?it\\\"\"?s\"\"\"?")
.sqlWithNamedParameters)
.isEqualTo("$1\"\"\"?it\\\"?s\"\"\"$2");
.isEqualTo("$1\"\"\"?it\\\"\"?s\"\"\"$2");

assertThat(
parser.convertPositionalParametersToNamedParameters('?', "?$$?it$?s$$?")
Expand All @@ -1144,13 +1172,13 @@ public void testPostgreSQLDialectDialectConvertPositionalParametersToNamedParame

// Note: PostgreSQL allows a single-quoted string literal to contain line feeds.
assertEquals(
"$1'?it\\'?s \n ?it\\'?s'$2",
parser.convertPositionalParametersToNamedParameters('?', "?'?it\\'?s \n ?it\\'?s'?")
"$1'?it\\''?s \n ?it\\''?s'$2",
parser.convertPositionalParametersToNamedParameters('?', "?'?it\\''?s \n ?it\\''?s'?")
.sqlWithNamedParameters);
assertUnclosedLiteral("?'?it\\'?s \n ?it\\'?s?");
assertUnclosedLiteral("?'?it\\''?s \n ?it\\''?s?");
assertEquals(
"$1'''?it\\'?s \n ?it\\'?s'$2",
parser.convertPositionalParametersToNamedParameters('?', "?'''?it\\'?s \n ?it\\'?s'?")
"$1'''?it\\''?s \n ?it\\''?s'$2",
parser.convertPositionalParametersToNamedParameters('?', "?'''?it\\''?s \n ?it\\''?s'?")
.sqlWithNamedParameters);

assertThat(
Expand Down