Skip to content

Remove unnecessary parameter. #3828

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.

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

Closed
Closed
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
* @author Diego Krupitza
* @author Mark Paluch
* @author Aleksei Elin
* @author Gunha Hwang
*/
class StringQueryUnitTests {

Expand Down Expand Up @@ -735,32 +736,32 @@ private void checkAlias(String query, String expected, String description, boole
@Test // DATAJPA-1200
void testHasNamedParameter() {

checkHasNamedParameter("select something from x where id = :id", true, "named parameter", true);
checkHasNamedParameter("in the :id middle", true, "middle", false);
checkHasNamedParameter(":id start", true, "beginning", false);
checkHasNamedParameter(":id", true, "alone", false);
checkHasNamedParameter("select something from x where id = :id", true, "named parameter", true);
checkHasNamedParameter(":UPPERCASE", true, "uppercase", false);
checkHasNamedParameter(":lowercase", true, "lowercase", false);
checkHasNamedParameter(":2something", true, "beginning digit", false);
checkHasNamedParameter(":2", true, "only digit", false);
checkHasNamedParameter(":.something", true, "dot", false);
checkHasNamedParameter(":_something", true, "underscore", false);
checkHasNamedParameter(":$something", true, "dollar", false);
checkHasNamedParameter(":\uFE0F", true, "non basic latin emoji", false); //
checkHasNamedParameter(":\u4E01", true, "chinese japanese korean", false);

checkHasNamedParameter("no bind variable", false, "no bind variable", false);
checkHasNamedParameter(":\u2004whitespace", false, "non basic latin whitespace", false);
checkHasNamedParameter("select something from x where id = ?1", false, "indexed parameter", true);
checkHasNamedParameter("::", false, "double colon", false);
checkHasNamedParameter(":", false, "end of query", false);
checkHasNamedParameter(":\u0003", false, "non-printable", false);
checkHasNamedParameter(":*", false, "basic latin emoji", false);
checkHasNamedParameter("\\:", false, "escaped colon", false);
checkHasNamedParameter("::id", false, "double colon with identifier", false);
checkHasNamedParameter("\\:id", false, "escaped colon with identifier", false);
checkHasNamedParameter("select something from x where id = #something", false, "hash", true);
checkHasNamedParameter("select something from x where id = :id", true, "named parameter");
checkHasNamedParameter("in the :id middle", true, "middle");
checkHasNamedParameter(":id start", true, "beginning");
checkHasNamedParameter(":id", true, "alone");
checkHasNamedParameter("select something from x where id = :id", true, "named parameter");
checkHasNamedParameter(":UPPERCASE", true, "uppercase");
checkHasNamedParameter(":lowercase", true, "lowercase");
checkHasNamedParameter(":2something", true, "beginning digit");
checkHasNamedParameter(":2", true, "only digit");
checkHasNamedParameter(":.something", true, "dot");
checkHasNamedParameter(":_something", true, "underscore");
checkHasNamedParameter(":$something", true, "dollar");
checkHasNamedParameter(":\uFE0F", true, "non basic latin emoji"); //
checkHasNamedParameter(":\u4E01", true, "chinese japanese korean");

checkHasNamedParameter("no bind variable", false, "no bind variable");
checkHasNamedParameter(":\u2004whitespace", false, "non basic latin whitespace");
checkHasNamedParameter("select something from x where id = ?1", false, "indexed parameter");
checkHasNamedParameter("::", false, "double colon");
checkHasNamedParameter(":", false, "end of query");
checkHasNamedParameter(":\u0003", false, "non-printable");
checkHasNamedParameter(":*", false, "basic latin emoji");
checkHasNamedParameter("\\:", false, "escaped colon");
checkHasNamedParameter("::id", false, "double colon with identifier");
checkHasNamedParameter("\\:id", false, "escaped colon with identifier");
checkHasNamedParameter("select something from x where id = #something", false, "hash");
}

@Test // DATAJPA-1235
Expand Down Expand Up @@ -921,7 +922,7 @@ void checkNumberOfNamedParameters(String query, int expectedSize, String label,
.hasSize(expectedSize);
}

private void checkHasNamedParameter(String query, boolean expected, String label, boolean nativeQuery) {
private void checkHasNamedParameter(String query, boolean expected, String label) {

List<ParameterBinding> bindings = new ArrayList<>();
StringQuery.ParameterBindingParser.INSTANCE.parseParameterBindingsOfQueryIntoBindingsAndReturnCleanedQuery(query,
Expand Down