HHH-11383 - Removed InvalidWithClauseException check when join alias != table alias

Author: Naros

hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java

@@ -563,12 +563,12 @@ public void visit(AST node) {
 					//      needed because currently persister is the one that
 					// creates and renders the join fragments for inheritance
 					//      hierarchies...
-					if ( !joinAlias.equals( referencedFromElement.getTableAlias() ) ) {
-						throw new InvalidWithClauseException(
-								"with clause can only reference columns in the driving table",
-								queryTranslatorImpl.getQueryString()
-						);
-					}
+//					if ( !joinAlias.equals( referencedFromElement.getTableAlias() ) ) {
+//						throw new InvalidWithClauseException(
+//								"with clause can only reference columns in the driving table",
+//								queryTranslatorImpl.getQueryString()
+//						);
+//					}
 				}
 			}
 			else if ( node instanceof ParameterNode ) {

hibernate-core/src/test/java/org/hibernate/test/hql/WithClauseTest.java

@@ -7,7 +7,6 @@
 package org.hibernate.test.hql;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -17,7 +16,6 @@
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.hql.internal.ast.InvalidWithClauseException;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -66,43 +64,6 @@ public void testWithClauseFailsWithFetch() {
 		data.cleanup();
 	}
 
-	@Test
-	public void testInvalidWithSemantics() {
-		Session s = openSession();
-		Transaction txn = s.beginTransaction();
-
-		try {
-			// PROBLEM : f.bodyWeight is a reference to a column on the Animal table; however, the 'f'
-			// alias relates to the Human.friends collection which the aonther Human entity.  The issue
-			// here is the way JoinSequence and Joinable (the persister) interact to generate the
-			// joins relating to the sublcass/superclass tables
-			s.createQuery( "from Human h inner join h.friends as f with f.bodyWeight < :someLimit" )
-					.setDouble( "someLimit", 1 )
-					.list();
-			fail( "failure expected" );
-		}
-		catch (IllegalArgumentException e) {
-			assertTyping( QueryException.class, e.getCause() );
-		}
-		catch( InvalidWithClauseException expected ) {
-		}
-
-		try {
-			s.createQuery( "from Human h inner join h.offspring o with o.mother.father = :cousin" )
-					.setEntity( "cousin", s.load( Human.class, new Long(123) ) )
-					.list();
-			fail( "failure expected" );
-		}
-		catch (IllegalArgumentException e) {
-			assertTyping( QueryException.class, e.getCause() );
-		}
-		catch( InvalidWithClauseException expected ) {
-		}
-
-		txn.commit();
-		s.close();
-	}
-
 	@Test
 	public void testWithClause() {
 		TestData data = new TestData();
@@ -123,6 +84,11 @@ public void testWithClause() {
 				.list();
 		assertTrue( "ad-hoc on did not take effect", list.isEmpty() );
 
+		list = s.createQuery( "from Human h inner join h.friends f with f.bodyWeight < :someLimit" )
+				.setDouble( "someLimit", 25 )
+				.list();
+		assertTrue( "ad-hoc on did take effect", !list.isEmpty() );
+
 		// many-to-many
 		list = s.createQuery( "from Human h inner join h.friends as f with f.nickName like 'bubba'" )
 				.list();
@@ -133,6 +99,11 @@ public void testWithClause() {
 				.list();
 		assertTrue( "ad-hoc on did not take effect", list.isEmpty() );
 
+		list = s.createQuery( "from Human h inner join h.offspring o with o.mother.father = :cousin" )
+				.setEntity( "cousin", s.load( Human.class, Long.valueOf( "123" ) ) )
+				.list();
+		assertTrue( "ad-hoc did take effect", list.isEmpty() );
+
 		txn.commit();
 		s.close();