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

HHH-6672 - Remove UNION support from 5.x grammars

This commit is contained in:
Steve Ebersole 2015-11-04 21:18:28 -06:00
parent 22ffaea0c3
commit dd4f809d20
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hibernate-core/src/main/antlr/hql.g
View File

@ -74,7 +74,6 @@ tokens
SOME="some";
SUM="sum";
TRUE="true";
UNION="union";
UPDATE="update";
VERSIONED="versioned";
WHERE="where";
@ -298,10 +297,6 @@ insertablePropertySpec
}
;
union
: queryRule (UNION queryRule)*
;
//## query:
//## [selectClause] fromClause [whereClause] [groupByClause] [havingClause] [orderByClause];
@ -805,7 +800,7 @@ compoundExpr
;
subQuery
: union
: queryRule
{ #subQuery = #([QUERY,"query"], #subQuery); }
;

8
hibernate-core/src/test/java/org/hibernate/test/hql/HqlParserTest.java
View File

@ -33,13 +33,7 @@ import static org.junit.Assert.fail;
* works properly (i.e. no unexpected syntax errors).
* todo this should be a unit test.
*/
public class HqlParserTest{
@Test
public void testUnion() throws Exception {
parse("from Animal a where a in (from Cat union from Dog) ");
}
public class HqlParserTest {
/**
* Section 9.2 - from *