Port: Error during use NEW keyword for enum in loader query #88

jmix-projects · Jul 6, 2021 · 73283d4 · 73283d4
1 parent 4d13459
commit 73283d4
Show file tree

Hide file tree

Showing 4 changed files with 6,938 additions and 6,764 deletions.
diff --git a/data/src/main/java/io/jmix/data/impl/jpql/antlr2/JPA2.g b/data/src/main/java/io/jmix/data/impl/jpql/antlr2/JPA2.g
@@ -498,7 +498,8 @@ constructor_name
     : WORD ('.'  WORD)*;
 
 enum_literal
-    : WORD;
+    : WORD | 'SELECT' | 'FROM' | 'GROUP' | 'ORDER' | 'MAX' | 'MIN' | 'SUM' | 'AVG' | 'COUNT' | 'AS' | 'MEMBER' | 'CASE'
+              | 'OBJECT' | 'SET' | 'DESC' | 'ASC' | 'NEW';
 
 boolean_literal
     : 'true'
@@ -555,7 +556,7 @@ collection_valued_input_parameter
 single_valued_input_parameter
     : input_parameter;
 enum_value_literal
-    : WORD ('.'  WORD)*;
+    : enum_literal ('.'  enum_literal)*;
 
 // Lexical Rules
 //fix trim character