[Hibernate-commits] Hibernate2/src/net/sf/hibernate/loader EntityLoader.java,1.7,1.8 OneToManyLoader.java,1.6,1.7 OuterJoinLoader.java,1.10,1.11

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader
In directory sc8-pr-cvs1:/tmp/cvs-serv9385/sf/hibernate/loader

Modified Files:
	EntityLoader.java OneToManyLoader.java OuterJoinLoader.java 
Log Message:
fixed bug in generated SQL for loading <joined-subclass>es

Index: EntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/EntityLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EntityLoader.java	20 Jan 2003 12:48:12 -0000	1.7
--- EntityLoader.java	24 Jan 2003 13:07:17 -0000	1.8
***************
*** 47,51 ****
  				selectString( persister, alias, suffixes[joins] )
  			)
! 			.setFromClause( persister.fromClauseFragment(alias, true, true) )
  			.setWhereClause(
  				new ConditionFragment().setTableAlias(alias)
--- 47,54 ----
  				selectString( persister, alias, suffixes[joins] )
  			)
! 			.setFromClause( 
! 				persister.fromTableFragment(alias) +
! 				persister.fromJoinFragment(alias, true, true)
! 			)
  			.setWhereClause(
  				new ConditionFragment().setTableAlias(alias)
***************
*** 55,59 ****
  			.setOuterJoins(
  				ojf.toFromFragmentString(),
! 				ojf.toWhereFragmentString()
  			)
  			.toStatementString();
--- 58,63 ----
  			.setOuterJoins(
  				ojf.toFromFragmentString(),
! 				ojf.toWhereFragmentString() + 
! 				persister.whereJoinFragment(alias, true, true)
  			)
  			.toStatementString();

Index: OneToManyLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/OneToManyLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OneToManyLoader.java	20 Jan 2003 12:48:13 -0000	1.6
--- OneToManyLoader.java	24 Jan 2003 13:07:17 -0000	1.7
***************
*** 60,64 ****
  				selectString( persister, alias, suffixes[joins] )
  			)
! 			.setFromClause( persister.fromClauseFragment(alias, true, true) )
  			.setWhereClause( 
  				new ConditionFragment().setTableAlias(collAlias)
--- 60,67 ----
  				selectString( persister, alias, suffixes[joins] )
  			)
! 			.setFromClause( 
! 				persister.fromTableFragment(alias) +
! 				persister.fromJoinFragment(alias, true, true)
! 			)
  			.setWhereClause( 
  				new ConditionFragment().setTableAlias(collAlias)
***************
*** 68,72 ****
  			.setOuterJoins(
  				ojf.toFromFragmentString(),
! 				ojf.toWhereFragmentString()
  			);
  		if ( collPersister.hasOrdering() ) select.setOrderByClause( collPersister.getSQLOrderByString(collAlias) );
--- 71,76 ----
  			.setOuterJoins(
  				ojf.toFromFragmentString(),
! 				ojf.toWhereFragmentString() +
! 				persister.whereJoinFragment(alias, true, true)
  			);
  		if ( collPersister.hasOrdering() ) select.setOrderByClause( collPersister.getSQLOrderByString(collAlias) );

Index: OuterJoinLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/OuterJoinLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** OuterJoinLoader.java	24 Jan 2003 10:21:35 -0000	1.10
--- OuterJoinLoader.java	24 Jan 2003 13:07:17 -0000	1.11
***************
*** 220,225 ****
  	 */
  	private static final void appendSelectString(StringBuffer buf, Loadable persister, String alias, String suffix) {
! 		buf.append( persister.identifierSelectClauseFragment(alias, suffix) )
! 			.append( persister.propertySelectClauseFragment(alias, suffix) );
  	}
  	
--- 220,225 ----
  	 */
  	private static final void appendSelectString(StringBuffer buf, Loadable persister, String alias, String suffix) {
! 		buf.append( persister.identifierSelectFragment(alias, suffix) )
! 			.append( persister.propertySelectFragment(alias, suffix) );
  	}
  	
***************
*** 262,267 ****
  			);
  			outerjoin.addJoins(
! 				oj.subpersister.fromJoinFragment(oj.subalias, false),
! 				oj.subpersister.whereJoinFragment(oj.subalias, false)
  			);
  			
--- 262,267 ----
  			);
  			outerjoin.addJoins(
! 				oj.subpersister.fromJoinFragment(oj.subalias, false, true),
! 				oj.subpersister.whereJoinFragment(oj.subalias, false, true)
  			);