Skip to content

Commit 3153bce

Browse files
nathan.xugavinking
authored andcommitted
HHH-18808 remove logging when keyword is used as identifier in HqlParser.g4
1 parent f7c5ff2 commit 3153bce

File tree

2 files changed

+8
-32
lines changed

2 files changed

+8
-32
lines changed

hibernate-core/src/main/antlr/org/hibernate/grammars/hql/HqlParser.g4

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ options {
1414
package org.hibernate.grammars.hql;
1515
}
1616

17-
@members {
18-
protected void logUseOfReservedWordAsIdentifier(Token token) {
19-
}
20-
}
21-
22-
2317
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2418
// Statements
2519

@@ -1851,7 +1845,7 @@ xmltableDefaultClause
18511845
nakedIdentifier
18521846
: IDENTIFIER
18531847
| QUOTED_IDENTIFIER
1854-
| (ABSENT
1848+
| ABSENT
18551849
| ALL
18561850
| AND
18571851
| ANY
@@ -2057,17 +2051,14 @@ xmltableDefaultClause
20572051
| XMLQUERY
20582052
| XMLTABLE
20592053
| YEAR
2060-
| ZONED) {
2061-
logUseOfReservedWordAsIdentifier( getCurrentToken() );
2062-
}
2054+
| ZONED
20632055
;
2056+
20642057
identifier
20652058
: nakedIdentifier
2066-
| (FULL
2059+
| FULL
20672060
| INNER
20682061
| LEFT
20692062
| OUTER
2070-
| RIGHT) {
2071-
logUseOfReservedWordAsIdentifier( getCurrentToken() );
2072-
}
2063+
| RIGHT
20732064
;

hibernate-core/src/main/java/org/hibernate/query/hql/internal/HqlParseTreeBuilder.java

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,17 @@
44
*/
55
package org.hibernate.query.hql.internal;
66

7-
import org.hibernate.grammars.hql.HqlLexer;
8-
import org.hibernate.grammars.hql.HqlParser;
9-
import org.hibernate.query.hql.HqlLogging;
10-
11-
import org.jboss.logging.Logger;
12-
137
import org.antlr.v4.runtime.CharStreams;
148
import org.antlr.v4.runtime.CommonTokenStream;
15-
import org.antlr.v4.runtime.Token;
9+
import org.hibernate.grammars.hql.HqlLexer;
10+
import org.hibernate.grammars.hql.HqlParser;
1611

1712
/**
1813
* Leverages ANTLR to build a parse tree from an HQL query.
1914
*
2015
* @author Steve Ebersole
2116
*/
2217
public class HqlParseTreeBuilder {
23-
private static final Logger LOGGER = HqlLogging.subLogger( "reservedWordAsIdentifier" );
24-
private static final boolean DEBUG_ENABLED = LOGGER.isDebugEnabled();
25-
2618
/**
2719
* Singleton access
2820
*/
@@ -34,13 +26,6 @@ public HqlLexer buildHqlLexer(String hql) {
3426

3527
public HqlParser buildHqlParser(String hql, HqlLexer hqlLexer) {
3628
// Build the parser
37-
return new HqlParser( new CommonTokenStream( hqlLexer ) ) {
38-
@Override
39-
protected void logUseOfReservedWordAsIdentifier(Token token) {
40-
if ( DEBUG_ENABLED ) {
41-
LOGGER.debugf( "Encountered use of reserved word as identifier : %s", token.getText() );
42-
}
43-
}
44-
};
29+
return new HqlParser( new CommonTokenStream( hqlLexer ) );
4530
}
4631
}

0 commit comments

Comments
 (0)