Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader
In directory sc8-pr-cvs1:/tmp/cvs-serv25986/loader
Modified Files:
CollectionLoader.java EntityLoader.java OneToManyLoader.java
OuterJoinLoader.java
Log Message:
continued refactoring of hql package
Index: CollectionLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/CollectionLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CollectionLoader.java 15 Feb 2003 01:00:53 -0000 1.9
--- CollectionLoader.java 23 Feb 2003 07:22:11 -0000 1.10
***************
*** 14,18 ****
import net.sf.hibernate.persister.Loadable;
import net.sf.hibernate.sql.ConditionFragment;
! import net.sf.hibernate.sql.OuterJoinFragment;
import net.sf.hibernate.sql.Select;
import net.sf.hibernate.type.Type;
--- 14,18 ----
import net.sf.hibernate.persister.Loadable;
import net.sf.hibernate.sql.ConditionFragment;
! import net.sf.hibernate.sql.JoinFragment;
import net.sf.hibernate.sql.Select;
import net.sf.hibernate.type.Type;
***************
*** 47,51 ****
for ( int i=0; i<joins; i++ ) suffixes[i] = Integer.toString(i) + StringHelper.UNDERSCORE;
! OuterJoinFragment ojf = outerJoins(associations);
Select select = new Select()
.setSelectClause(
--- 47,51 ----
for ( int i=0; i<joins; i++ ) suffixes[i] = Integer.toString(i) + StringHelper.UNDERSCORE;
! JoinFragment ojf = outerJoins(associations);
Select select = new Select()
.setSelectClause(
Index: EntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/EntityLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EntityLoader.java 1 Feb 2003 12:22:35 -0000 1.10
--- EntityLoader.java 23 Feb 2003 07:22:11 -0000 1.11
***************
*** 13,17 ****
import net.sf.hibernate.persister.Loadable;
import net.sf.hibernate.sql.ConditionFragment;
! import net.sf.hibernate.sql.OuterJoinFragment;
import net.sf.hibernate.sql.Select;
import net.sf.hibernate.type.Type;
--- 13,17 ----
import net.sf.hibernate.persister.Loadable;
import net.sf.hibernate.sql.ConditionFragment;
! import net.sf.hibernate.sql.JoinFragment;
import net.sf.hibernate.sql.Select;
import net.sf.hibernate.type.Type;
***************
*** 41,45 ****
for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? StringHelper.EMPTY_STRING : Integer.toString(i) + StringHelper.UNDERSCORE;
! OuterJoinFragment ojf = outerJoins(associations);
sql = new Select()
.setSelectClause(
--- 41,45 ----
for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? StringHelper.EMPTY_STRING : Integer.toString(i) + StringHelper.UNDERSCORE;
! JoinFragment ojf = outerJoins(associations);
sql = new Select()
.setSelectClause(
Index: OneToManyLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/OneToManyLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** OneToManyLoader.java 15 Feb 2003 01:00:54 -0000 1.10
--- OneToManyLoader.java 23 Feb 2003 07:22:11 -0000 1.11
***************
*** 14,18 ****
import net.sf.hibernate.persister.Loadable;
import net.sf.hibernate.sql.ConditionFragment;
! import net.sf.hibernate.sql.OuterJoinFragment;
import net.sf.hibernate.sql.Select;
import net.sf.hibernate.type.EntityType;
--- 14,18 ----
import net.sf.hibernate.persister.Loadable;
import net.sf.hibernate.sql.ConditionFragment;
! import net.sf.hibernate.sql.JoinFragment;
import net.sf.hibernate.sql.Select;
import net.sf.hibernate.type.EntityType;
***************
*** 55,59 ****
for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? StringHelper.EMPTY_STRING : Integer.toString(i) + StringHelper.UNDERSCORE;
! OuterJoinFragment ojf = outerJoins(associations);
Select select = new Select()
.setSelectClause(
--- 55,59 ----
for ( int i=0; i<=joins; i++ ) suffixes[i] = (joins==0) ? StringHelper.EMPTY_STRING : Integer.toString(i) + StringHelper.UNDERSCORE;
! JoinFragment ojf = outerJoins(associations);
Select select = new Select()
.setSelectClause(
Index: OuterJoinLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/OuterJoinLoader.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** OuterJoinLoader.java 23 Feb 2003 01:32:20 -0000 1.12
--- OuterJoinLoader.java 23 Feb 2003 07:22:11 -0000 1.13
***************
*** 15,19 ****
import net.sf.hibernate.persister.Loadable;
import net.sf.hibernate.persister.NormalizedEntityPersister;
! import net.sf.hibernate.sql.OuterJoinFragment;
import net.sf.hibernate.type.AbstractComponentType;
import net.sf.hibernate.type.EntityType;
--- 15,19 ----
import net.sf.hibernate.persister.Loadable;
import net.sf.hibernate.persister.NormalizedEntityPersister;
! import net.sf.hibernate.sql.JoinFragment;
import net.sf.hibernate.type.AbstractComponentType;
import net.sf.hibernate.type.EntityType;
***************
*** 249,254 ****
* Generate a sequence of <tt>LEFT OUTER JOIN</tt> clauses for the given associations.
*/
! public final OuterJoinFragment outerJoins(List associations) {
! OuterJoinFragment outerjoin = dialect.createOuterJoinFragment();
Iterator iter = associations.iterator();
while ( iter.hasNext() ) {
--- 249,254 ----
* Generate a sequence of <tt>LEFT OUTER JOIN</tt> clauses for the given associations.
*/
! public final JoinFragment outerJoins(List associations) {
! JoinFragment outerjoin = dialect.createOuterJoinFragment();
Iterator iter = associations.iterator();
while ( iter.hasNext() ) {
***************
*** 259,263 ****
oj.foreignKeyColumns,
oj.subpersister.getIdentifierColumnNames(),
! OuterJoinFragment.LEFT_OUTER_JOIN
);
outerjoin.addJoins(
--- 259,263 ----
oj.foreignKeyColumns,
oj.subpersister.getIdentifierColumnNames(),
! JoinFragment.LEFT_OUTER_JOIN
);
outerjoin.addJoins(
|
