[Hibernate-commits] Hibernate2/src/net/sf/hibernate/persister EntityPersister.java,1.18,1.19 NormalizedEntityPersister.java,1.11,1.12 Queryable.java,1.5,1.6

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

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

Modified Files:
	EntityPersister.java NormalizedEntityPersister.java 
	Queryable.java 
Log Message:
fixed a problem with outer joins and subclasses

Index: EntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/persister/EntityPersister.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** EntityPersister.java	23 Feb 2003 01:32:20 -0000	1.18
--- EntityPersister.java	2 Mar 2003 06:58:51 -0000	1.19
***************
*** 820,826 ****
  	}
  
! 	public String queryWhereFragment(String name, boolean includeSubclasses) throws MappingException {
  		
! 		if ( isInherited() ) {
  			InFragment frag = new InFragment()
  				.setColumn( name, getDiscriminatorColumnName() );
--- 820,826 ----
  	}
  
! 	public String queryWhereFragment(String name, boolean innerJoin, boolean includeSubclasses) throws MappingException {
  		
! 		if ( innerJoin && isInherited() ) {
  			InFragment frag = new InFragment()
  				.setColumn( name, getDiscriminatorColumnName() );
***************
*** 834,838 ****
  		}
  		else {
! 			return "";
  		}
  		
--- 834,838 ----
  		}
  		else {
! 			return StringHelper.EMPTY_STRING;
  		}
  		

Index: NormalizedEntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/persister/NormalizedEntityPersister.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NormalizedEntityPersister.java	23 Feb 2003 07:22:11 -0000	1.11
--- NormalizedEntityPersister.java	2 Mar 2003 06:58:52 -0000	1.12
***************
*** 1035,1040 ****
  	}
  
! 	public String queryWhereFragment(String alias, boolean includeSubclasses) throws MappingException {
! 		return whereJoinFragment(alias, true, includeSubclasses);
  	}
  
--- 1035,1040 ----
  	}
  
! 	public String queryWhereFragment(String alias, boolean innerJoin, boolean includeSubclasses) throws MappingException {
! 		return whereJoinFragment(alias, innerJoin, includeSubclasses);
  	}
  

Index: Queryable.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/persister/Queryable.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Queryable.java	24 Jan 2003 10:21:36 -0000	1.5
--- Queryable.java	2 Mar 2003 06:58:53 -0000	1.6
***************
*** 44,48 ****
  	 * Get the where clause fragment, given a query alias
  	 */
! 	public String queryWhereFragment(String alias, boolean includeSubclasses) throws MappingException;
  	
  	/**
--- 44,48 ----
  	 * Get the where clause fragment, given a query alias
  	 */
! 	public String queryWhereFragment(String alias, boolean innerJoin, boolean includeSubclasses) throws MappingException;
  	
  	/**