Skip to content

Make Escaper to escape the escape character itself #2189

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

Open
avdotius wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make Escaper to escape the escape character itself #2189

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...ta-relational/src/main/java/org/springframework/data/relational/core/dialect/Escaper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*
* @author Roman Chigvintsev
* @author Mark Paluch
* @author Alexander Tochin
* @since 2.0
*/
public class Escaper {
Expand Down Expand Up @@ -84,6 +85,7 @@ public char getEscapeCharacter() {

/**
* Escapes all special like characters ({@code _}, {@code %}) using the configured escape character.
* Escape character itself is also escaped.
*
* @param value value to be escaped
* @return escaped value
Expand All @@ -94,6 +96,11 @@ public char getEscapeCharacter() {
return null;
}

return toReplace.stream().reduce(value, (it, character) -> it.replace(character, escapeCharacter + character));
String escapeCharString = String.valueOf(escapeCharacter);
String escapedValue = value.replace(escapeCharString, escapeCharString.repeat(2));
for (String character : toReplace) {
escapedValue = escapedValue.replace(character, escapeCharacter + character);
}
return escapedValue;
}
}
13 changes: 13 additions & 0 deletions ...onal/src/test/java/org/springframework/data/relational/core/dialect/EscaperUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*
* @author Roman Chigvintsev
* @author Mark Paluch
* @author Alexander Tochin
*/
public class EscaperUnitTests {

Expand Down Expand Up @@ -71,4 +72,16 @@ public void escapesSpecialCharactersUsingCustomEscapeCharacter() {
public void escapesAdditionalCharacters() {
assertThat(Escaper.DEFAULT.withRewriteFor("[", "]").escape("Hello Wo[Rr]ld")).isEqualTo("Hello Wo\\[Rr\\]ld");
}

@Test // GH-2182
public void escapesCharactersUsingDefaultEscapeCharacter() {
assertThat(Escaper.DEFAULT.escape("%te\\st_")).isEqualTo("\\%te\\\\st\\_");
//assertThat(Escaper.of('$').escape("_%")).isEqualTo("$_$%");
}

@Test // GH-2182
public void escapesCharactersUsingCustomEscapeCharacter() {
assertThat(Escaper.DEFAULT.escape("%te\\st_")).isEqualTo("\\%te\\\\st\\_");
assertThat(Escaper.of('$').escape("%te$st_")).isEqualTo("$%te$$st$_");
}
}