[hibernate-commits] Hibernate SVN: r16666 - in core/branches/Branch_3_3: testsuite/src/test/java/org/hibernate/test/hql and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2009-06-02 11:39:21 -0400 (Tue, 02 Jun 2009)
New Revision: 16666

Modified:
   core/branches/Branch_3_3/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java
   core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/hql/WithClauseTest.java
Log:
HHH-1930 - QuerySyntaxException "with-clause expressions did not reference from-clause element to which the with-clause was associated"


Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java
===================================================================
--- core/branches/Branch_3_3/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java	2009-06-02 09:30:14 UTC (rev 16665)
+++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java	2009-06-02 15:39:21 UTC (rev 16666)
@@ -66,7 +66,6 @@
 import org.hibernate.hql.ast.tree.SelectClause;
 import org.hibernate.hql.ast.tree.SelectExpression;
 import org.hibernate.hql.ast.tree.UpdateStatement;
-import org.hibernate.hql.ast.tree.Node;
 import org.hibernate.hql.ast.tree.OperatorNode;
 import org.hibernate.hql.ast.tree.ParameterContainer;
 import org.hibernate.hql.ast.util.ASTPrinter;
@@ -382,9 +381,7 @@
 			log.debug( "createFromJoinElement() : " + getASTPrinter().showAsString( fromElement, "-- join tree --" ) );
 		}
 	}
-
-	private void handleWithFragment(FromElement fromElement, AST hqlWithNode) throws SemanticException
-	{
+	private void handleWithFragment(FromElement fromElement, AST hqlWithNode) throws SemanticException {
 		try {
 			withClause( hqlWithNode );
 			AST hqlSqlWithNode = returnAST;
@@ -394,13 +391,22 @@
 			WithClauseVisitor visitor = new WithClauseVisitor( fromElement );
 			NodeTraverser traverser = new NodeTraverser( visitor );
 			traverser.traverseDepthFirst( hqlSqlWithNode );
-			FromElement referencedFromElement = visitor.getReferencedFromElement();
-			if ( referencedFromElement != fromElement ) {
-				throw new InvalidWithClauseException( "with-clause expressions did not reference from-clause element to which the with-clause was associated" );
+
+			String withClauseJoinAlias = visitor.getJoinAlias();
+			if ( withClauseJoinAlias == null ) {
+				withClauseJoinAlias = fromElement.getCollectionTableAlias();
 			}
+			else {
+				FromElement referencedFromElement = visitor.getReferencedFromElement();
+				if ( referencedFromElement != fromElement ) {
+					throw new InvalidWithClauseException( "with-clause expressions did not reference from-clause element to which the with-clause was associated" );
+				}
+			}
+
 			SqlGenerator sql = new SqlGenerator( getSessionFactoryHelper().getFactory() );
 			sql.whereExpr( hqlSqlWithNode.getFirstChild() );
-			fromElement.setWithClauseFragment( visitor.getJoinAlias(), "(" + sql.getSQL() + ")" );
+
+			fromElement.setWithClauseFragment( withClauseJoinAlias, "(" + sql.getSQL() + ")" );
 		}
 		catch( SemanticException e ) {
 			throw e;
@@ -888,8 +894,8 @@
 		}
 		ParameterNode parameter = ( ParameterNode ) astFactory.create( PARAM, "?" );
 		PositionalParameterSpecification paramSpec = new PositionalParameterSpecification(
-				( ( Node ) inputNode ).getLine(),
-		        ( ( Node ) inputNode ).getColumn(),
+				inputNode.getLine(),
+		        inputNode.getColumn(),
 				positionalParameterCount++
 		);
 		parameter.setHqlParameterSpecification( paramSpec );
@@ -907,8 +913,8 @@
 		parameter.setText( "?" );
 
 		NamedParameterSpecification paramSpec = new NamedParameterSpecification(
-				( ( Node ) delimiterNode ).getLine(),
-		        ( ( Node ) delimiterNode ).getColumn(),
+				delimiterNode.getLine(),
+		        delimiterNode.getColumn(),
 				name
 		);
 		parameter.setHqlParameterSpecification( paramSpec );

Modified: core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/hql/WithClauseTest.java
===================================================================
--- core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/hql/WithClauseTest.java	2009-06-02 09:30:14 UTC (rev 16665)
+++ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/hql/WithClauseTest.java	2009-06-02 15:39:21 UTC (rev 16666)
@@ -123,6 +123,11 @@
 				.list();
 		assertTrue( "ad-hoc on did not take effect", list.isEmpty() );
 
+		// http://opensource.atlassian.com/projects/hibernate/browse/HHH-1930
+		list = s.createQuery( "from Human h inner join h.nickNames as nicknames with nicknames = 'abc'" )
+				.list();
+		assertTrue( "ad-hoc on did not take effect", list.isEmpty() );
+
 		txn.commit();
 		s.close();