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

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

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

Modified Files:
	CollectionLoader.java EntityLoader.java OneToManyLoader.java 
Log Message:
fixed a problem outerjoin loading many-to-manys with a repeated column name

Index: CollectionLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/CollectionLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CollectionLoader.java	20 Jan 2003 12:48:12 -0000	1.6
--- CollectionLoader.java	1 Feb 2003 00:17:17 -0000	1.7
***************
*** 42,51 ****
  		int joins=associations.size();
  		suffixes = new String[joins];
! 		for ( int i=0; i<joins; i++ ) suffixes[i] = (joins==1) ? StringHelper.EMPTY_STRING : Integer.toString(i);
  		
  		OuterJoinFragment ojf = outerJoins(associations);
  		Select select = new Select()
  			.setSelectClause( 
! 				persister.selectClauseFragment(alias) + ( joins==0 ? StringHelper.EMPTY_STRING : ", " + selectString(associations) )
  			)
  			.setFromClause( persister.getQualifiedTableName(), alias )
--- 42,52 ----
  		int joins=associations.size();
  		suffixes = new String[joins];
! 		for ( int i=0; i<joins; i++ ) suffixes[i] = Integer.toString(i) + '_';
  		
  		OuterJoinFragment ojf = outerJoins(associations);
  		Select select = new Select()
  			.setSelectClause( 
! 				persister.selectClauseFragment(alias) + 
! 				( joins==0 ? StringHelper.EMPTY_STRING : ", " + selectString(associations) )
  			)
  			.setFromClause( persister.getQualifiedTableName(), alias )

Index: EntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/EntityLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EntityLoader.java	24 Jan 2003 13:07:17 -0000	1.8
--- EntityLoader.java	1 Feb 2003 00:17:17 -0000	1.9
***************
*** 39,43 ****
  		int joins=associations.size();
  		suffixes = new String[joins+1];
! 		for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? StringHelper.EMPTY_STRING : Integer.toString(i);
  		
  		OuterJoinFragment ojf = outerJoins(associations);
--- 39,43 ----
  		int joins=associations.size();
  		suffixes = new String[joins+1];
! 		for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? StringHelper.EMPTY_STRING : Integer.toString(i) + '_';
  		
  		OuterJoinFragment ojf = outerJoins(associations);

Index: OneToManyLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/OneToManyLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OneToManyLoader.java	24 Jan 2003 13:07:17 -0000	1.7
--- OneToManyLoader.java	1 Feb 2003 00:17:17 -0000	1.8
***************
*** 50,54 ****
  		int joins=associations.size();
  		suffixes = new String[joins+1];
! 		for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? StringHelper.EMPTY_STRING : Integer.toString(i);
  		
  		OuterJoinFragment ojf = outerJoins(associations);
--- 50,54 ----
  		int joins=associations.size();
  		suffixes = new String[joins+1];
! 		for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? StringHelper.EMPTY_STRING : Integer.toString(i) + '_';
  		
  		OuterJoinFragment ojf = outerJoins(associations);