From: <one...@us...> - 2003-02-23 07:22:15
|
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/persister In directory sc8-pr-cvs1:/tmp/cvs-serv25986/persister Modified Files: NormalizedEntityPersister.java Log Message: continued refactoring of hql package Index: NormalizedEntityPersister.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/persister/NormalizedEntityPersister.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** NormalizedEntityPersister.java 23 Feb 2003 01:32:21 -0000 1.10 --- NormalizedEntityPersister.java 23 Feb 2003 07:22:11 -0000 1.11 *************** *** 40,44 **** import net.sf.hibernate.sql.Delete; import net.sf.hibernate.sql.Insert; ! import net.sf.hibernate.sql.OuterJoinFragment; import net.sf.hibernate.sql.SimpleSelect; import net.sf.hibernate.sql.SelectFragment; --- 40,44 ---- import net.sf.hibernate.sql.Delete; import net.sf.hibernate.sql.Insert; ! import net.sf.hibernate.sql.JoinFragment; import net.sf.hibernate.sql.SimpleSelect; import net.sf.hibernate.sql.SelectFragment; *************** *** 931,936 **** } ! private OuterJoinFragment outerjoin(String name, boolean innerJoin, boolean includeSubclasses) { ! OuterJoinFragment outerjoin = factory.getDialect().createOuterJoinFragment(); for ( int i=1; i<subclassTableNameClosure.length; i++ ) { if (includeSubclasses || isClassOrSuperclassTable[i]) { --- 931,936 ---- } ! private JoinFragment outerjoin(String name, boolean innerJoin, boolean includeSubclasses) { ! JoinFragment outerjoin = factory.getDialect().createOuterJoinFragment(); for ( int i=1; i<subclassTableNameClosure.length; i++ ) { if (includeSubclasses || isClassOrSuperclassTable[i]) { *************** *** 940,944 **** StringHelper.prefix( getIdentifierColumnNames(), name + StringHelper.DOT ), subclassTableKeyColumns[i], ! innerJoin && isClassOrSuperclassTable[i] ? OuterJoinFragment.INNER_JOIN : OuterJoinFragment.LEFT_OUTER_JOIN ); } --- 940,944 ---- StringHelper.prefix( getIdentifierColumnNames(), name + StringHelper.DOT ), subclassTableKeyColumns[i], ! innerJoin && isClassOrSuperclassTable[i] ? JoinFragment.INNER_JOIN : JoinFragment.LEFT_OUTER_JOIN ); } |