Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HQL function names should support schema-based prefixes.

Browse Source 
See #3099
This commit is contained in:
Greg L. Turnquist
2023-08-04 10:26:14 -05:00
parent b5106d1ada
commit a5cfcfb157
3 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4
View File

@@ -686,7 +686,7 @@ character
;
functionName
: reservedWord
: reservedWord ('.' reservedWord)*
;
reservedWord

12
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java
View File

@@ -2503,7 +2503,17 @@ class HqlQueryRenderer extends HqlBaseVisitor<List<JpaQueryParsingToken>> {
@Override
public List<JpaQueryParsingToken> visitFunctionName(HqlParser.FunctionNameContext ctx) {
return visit(ctx.reservedWord());
List<JpaQueryParsingToken> tokens = new ArrayList<>();
ctx.reservedWord().forEach(reservedWordContext -> {
tokens.addAll(visit(reservedWordContext));
NOSPACE(tokens);
tokens.add(TOKEN_DOT);
});
CLIP(tokens);
return tokens;
}
@Override

28
spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java
View File

@@ -1556,4 +1556,32 @@ class HqlQueryRendererTests {
assertQuery("select e from Employee e where e.type = :_type");
assertQuery("select te from TestEntity te where te.type = :type");
}
@Test // GH-3099
void functionNamesShouldSupportSchemaScoping() {
assertQuery("""
SELECT b
FROM MyEntity b
WHERE b.status = :status
AND utl_raw.cast_to_varchar2((nlssort(lower(b.name), 'nls_sort=binary_ai'))) LIKE lower(:name)
ORDER BY utl_raw.cast_to_varchar2((nlssort(lower(b.name), 'nls_sort=binary_ai'))) ASC
""");
assertQuery("""
select b
from Bairro b
where b.situacao = :situacao
and utl_raw.cast_to_varchar2((nlssort(lower(b.nome), 'nls_sort=binary_ai'))) like lower(:nome)
order by utl_raw.cast_to_varchar2((nlssort(lower(b.nome), 'nls_sort=binary_ai'))) ASC
""");
assertQuery("""
select b
from Bairro b
where b.situacao = :situacao
and CTM_UTLRAW_NLSSORT_LOWER(b.nome) like lower(:nome)
order by CTM_UTLRAW_NLSSORT_LOWER(b.nome) ASC
""");
}
}