Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader
In directory sc8-pr-cvs1:/tmp/cvs-serv27999/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/Hibernate/cirrus/hibernate/loader/CollectionLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CollectionLoader.java 26 Nov 2002 08:37:25 -0000 1.8
--- CollectionLoader.java 1 Feb 2003 00:16:31 -0000 1.9
***************
*** 38,42 ****
int joins=associations.size();
suffixes = new String[joins];
! for ( int i=0; i<joins; i++ ) suffixes[i] = (joins==1) ? "" : Integer.toString(i);
sql = sqlSelect(
--- 38,42 ----
int joins=associations.size();
suffixes = new String[joins];
! for ( int i=0; i<joins; i++ ) suffixes[i] = Integer.toString(i) + '_';
sql = sqlSelect(
Index: EntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/EntityLoader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** EntityLoader.java 15 Jan 2003 12:52:40 -0000 1.13
--- EntityLoader.java 1 Feb 2003 00:16:31 -0000 1.14
***************
*** 36,40 ****
int joins=associations.size();
suffixes = new String[joins+1];
! for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? "" : Integer.toString(i);
sql = sqlSelect(
--- 36,40 ----
int joins=associations.size();
suffixes = new String[joins+1];
! for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? "" : Integer.toString(i) + '_';
sql = sqlSelect(
Index: OneToManyLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/OneToManyLoader.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** OneToManyLoader.java 15 Jan 2003 12:52:40 -0000 1.15
--- OneToManyLoader.java 1 Feb 2003 00:16:31 -0000 1.16
***************
*** 46,50 ****
int joins=associations.size();
suffixes = new String[joins+1];
! for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? "" : Integer.toString(i);
sql = sqlSelect(
--- 46,50 ----
int joins=associations.size();
suffixes = new String[joins+1];
! for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? "" : Integer.toString(i) + '_';
sql = sqlSelect(
|
