[Hibernate-commits] Hibernate/cirrus/hibernate/loader CollectionLoader.java,1.7,1.8 OneToManyLoader.java,1.13,1.14

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader
In directory sc8-pr-cvs1:/tmp/cvs-serv3044/cirrus/hibernate/loader

Modified Files:
	CollectionLoader.java OneToManyLoader.java 
Log Message:
fixed bugs in one-to-many relationships to <joined-subclasses>

Index: CollectionLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/CollectionLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CollectionLoader.java	5 Nov 2002 06:46:06 -0000	1.7
--- CollectionLoader.java	26 Nov 2002 08:37:25 -0000	1.8
***************
*** 45,49 ****
  			( joins==0 ? "" : ", " + selectString(associations) ),
  			// FROM CLAUSE
! 			persister.getQualifiedTableName()+' '+alias,
  			// OUTER JOINS (Insertion Point 1)
  			outerJoinGenerator.outerJoinStringAfterFrom(associations),
--- 45,49 ----
  			( joins==0 ? "" : ", " + selectString(associations) ),
  			// FROM CLAUSE
! 			persister.getQualifiedTableName() + ' ' + alias,
  			// OUTER JOINS (Insertion Point 1)
  			outerJoinGenerator.outerJoinStringAfterFrom(associations),

Index: OneToManyLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/OneToManyLoader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** OneToManyLoader.java	26 Nov 2002 03:35:42 -0000	1.13
--- OneToManyLoader.java	26 Nov 2002 08:37:25 -0000	1.14
***************
*** 40,44 ****
  		
  		String alias = alias( collectionPersister.getQualifiedTableName(), 0 );
! 		//String alias = alias( persister.getTableName(), 0 );
  		
  		List associations = walkTree(persister, alias, session);
--- 40,44 ----
  		
  		String alias = alias( collectionPersister.getQualifiedTableName(), 0 );
! 		String collAlias = persister.getConcreteClassAlias(alias);
  		
  		List associations = walkTree(persister, alias, session);
***************
*** 50,54 ****
  		sql = sqlSelect(
  			// SELECT CLAUSE
! 			selectCollectionString(collPersister, alias) +
  			( joins==0 ? "" : ", " + selectString(associations) )
  			+ ", " +
--- 50,54 ----
  		sql = sqlSelect(
  			// SELECT CLAUSE
! 			selectCollectionString(collPersister, collAlias) +
  			( joins==0 ? "" : ", " + selectString(associations) )
  			+ ", " +
***************
*** 59,63 ****
  			outerJoinGenerator.outerJoinStringAfterFrom(associations),
  			// WHERE CLAUSE
! 			whereString( collPersister.getKeyColumnNames(), alias ), //BUG!!!!!!!!!!!
  			// OUTER JOINS (Insertion Point 2)
  			outerJoinGenerator.outerJoinStringAfterWhere(associations) +
--- 59,63 ----
  			outerJoinGenerator.outerJoinStringAfterFrom(associations),
  			// WHERE CLAUSE
! 			whereString( collPersister.getKeyColumnNames(), collAlias ),
  			// OUTER JOINS (Insertion Point 2)
  			outerJoinGenerator.outerJoinStringAfterWhere(associations) +
***************
*** 65,69 ****
  			// ORDER BY CLAUSE
  			collPersister.hasOrdering() ?
! 				collPersister.getSQLOrderByString(alias) :
  				null
  		);
--- 65,69 ----
  			// ORDER BY CLAUSE
  			collPersister.hasOrdering() ?
! 				collPersister.getSQLOrderByString(collAlias) :
  				null
  		);