HHH-2045 - HQL empty IN list

hibernate · Feb 19, 2013 · f4b45eb · f4b45eb
1 parent a44cc30
commit f4b45eb
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/hibernate-core/src/main/antlr/hql.g b/hibernate-core/src/main/antlr/hql.g
@@ -758,6 +758,7 @@ collectionExpr
 compoundExpr
 	: collectionExpr
 	| path
+	| { LA(1) == OPEN && LA(2) == CLOSE }? OPEN! CLOSE!
 	| (OPEN! ( (expression (COMMA! expression)*) | subQuery ) CLOSE!)
 	| parameter
 	;

diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/InLogicOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/InLogicOperatorNode.java
@@ -79,7 +79,9 @@ public void initialize() throws SemanticException {
         if ( !isNodeAcceptable( rhsNode ) )
             return;
         int rhsColumnSpan = 0;
-        if ( rhsNode.getType() == HqlTokenTypes.VECTOR_EXPR ) {
+        if ( rhsNode == null ) {
+            return; // early exit for empty IN list
+        } else if ( rhsNode.getType() == HqlTokenTypes.VECTOR_EXPR ) {
             rhsColumnSpan = rhsNode.getNumberOfChildren();
         } else {
             Type rhsType = extractDataType( rhsNode );
@@ -96,7 +98,7 @@ public void initialize() throws SemanticException {
 	 * this is possible for parameter lists and explicit lists. It is completely unreasonable for sub-queries.
 	 */
     private boolean isNodeAcceptable( Node rhsNode ) {
-        return rhsNode instanceof LiteralNode
+        return rhsNode == null /* empty IN list */ || rhsNode instanceof LiteralNode
                 || rhsNode instanceof ParameterNode
                 || rhsNode.getType() == HqlTokenTypes.VECTOR_EXPR;
     }

diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
@@ -49,6 +49,7 @@
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.DB2Dialect;
+import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.IngresDialect;
 import org.hibernate.dialect.MySQLDialect;
@@ -77,6 +78,7 @@
 import org.hibernate.test.cid.Product;
 import org.hibernate.testing.DialectChecks;
 import org.hibernate.testing.FailureExpected;
+import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.RequiresDialectFeature;
 import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.TestForIssue;
@@ -485,6 +487,33 @@ public void testPaginationWithPolymorphicQuery() {
 		s.close();
 	}
 
+	@Test
+	@TestForIssue( jiraKey = "HHH-2045" )
+	@RequiresDialect( H2Dialect.class )
+	public void testEmptyInList() {
+		Session session = openSession();
+		session.beginTransaction();
+		Human human = new Human();
+		human.setName( new Name( "Lukasz", null, "Antoniak" ) );
+		human.setNickName( "NONE" );
+		session.save( human );
+		session.getTransaction().commit();
+		session.close();
+
+		session = openSession();
+		session.beginTransaction();
+		List results = session.createQuery( "from Human h where h.nickName in ()" ).list();
+		assertEquals( 0, results.size() );
+		session.getTransaction().commit();
+		session.close();
+
+		session = openSession();
+		session.beginTransaction();
+		session.delete( human );
+		session.getTransaction().commit();
+		session.close();
+	}
+
 	@Test
 	public void testComponentNullnessChecks() {
 		Session s = openSession();

diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/HQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/HQLTest.java
@@ -245,7 +245,7 @@ public void testCollectionJoinsInSubselect() {
 	}
 
 	@Test
-	@FailureExpected( jiraKey = "N/A" )
+	@TestForIssue( jiraKey = "HHH-2045" )
 	public void testEmptyInList() {
 		assertTranslation( "select a from Animal a where a.description in ()" );
 	}