Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-18497 Make reserved word identification for JPA compliance more robust

This commit is contained in:
Christian Beikov 2024-09-20 21:43:32 +02:00
parent e2a1434017
commit 7ff0567383
1 changed files with 103 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmTreeCreationHelper.java
View File

@ -5,6 +5,7 @@
package org.hibernate.query.hql.internal;
import java.util.Locale;
import java.util.Set;
import org.hibernate.grammars.hql.HqlParser;
import org.hibernate.jpa.spi.JpaCompliance;
@ -19,8 +20,6 @@ import org.hibernate.query.sqm.tree.from.SqmRoot;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.ParseTree;
import static org.hibernate.grammars.hql.HqlParser.IDENTIFIER;
/**
* Helper for dealing with SQM tree creation
*
@ -28,6 +27,106 @@ import static org.hibernate.grammars.hql.HqlParser.IDENTIFIER;
*/
public class SqmTreeCreationHelper {
// The list is from the spec section 4.4.1
private static final Set<String> RESERVED_WORDS = Set.of(
"abs",
"all",
"and",
"any",
"as",
"asc",
"avg",
"between",
"bit_length",
"both",
"by",
"case",
"ceiling",
"char_length",
"character_length",
"class",
"coalesce",
"concat",
"count",
"current_date",
"current_time",
"current_timestamp",
"delete",
"desc",
"distinct",
"else",
"empty",
"end",
"entry",
"escape",
"exists",
"exp",
"extract",
"false",
"fetch",
"first",
"floor",
"from",
"function",
"group",
"having",
"in",
"index",
"inner",
"is",
"join",
"key",
"leading",
"last",
"left",
"length",
"like",
"local",
"ln",
"locate",
"lower",
"max",
"member",
"min",
"mod",
"new",
"not",
"null",
"nulls",
"nullif",
"object",
"of",
"on",
"or",
"order",
"outer",
"position",
"power",
"replace",
"right",
"round",
"select",
"set",
"sign",
"size",
"some",
"sqrt",
"substring",
"sum",
"then",
"trailing",
"treat",
"trim",
"true",
"type",
"unknown",
"update",
"upper",
"value",
"when",
"where"
);
/**
* Handle secondary query roots using cross-join semantics.
*
@ -108,7 +207,7 @@ public class SqmTreeCreationHelper {
// which JPA disallows...
if ( sqmBuilder.getCreationOptions().useStrictJpaCompliance() ) {
final Token identificationVariableToken = identifierContext.getStart();
if ( identificationVariableToken.getType() != IDENTIFIER ) {
if ( RESERVED_WORDS.contains( identificationVariableToken.getText().toLowerCase( Locale.ENGLISH ) ) ) {
throw new StrictJpaComplianceViolation(
String.format(
Locale.ROOT,
@ -128,7 +227,7 @@ public class SqmTreeCreationHelper {
// which JPA disallows...
if ( sqmBuilder.getCreationOptions().useStrictJpaCompliance() ) {
final Token identificationVariableToken = identifierContext.getStart();
if ( identificationVariableToken.getType() != IDENTIFIER ) {
if ( RESERVED_WORDS.contains( identificationVariableToken.getText().toLowerCase( Locale.ENGLISH ) ) ) {
throw new StrictJpaComplianceViolation(
String.format(
Locale.ROOT,