[Hibernate-commits] Hibernate/cirrus/hibernate/persister MultiTableEntityPersister.java,1.43,1.44

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister
In directory sc8-pr-cvs1:/tmp/cvs-serv3112/hibernate/persister

Modified Files:
	MultiTableEntityPersister.java 
Log Message:
applied patches by Robson Miranda and Benoit Menendez and added delimiter to drop statements in SchemaExporter

Index: MultiTableEntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister/MultiTableEntityPersister.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** MultiTableEntityPersister.java	18 Dec 2002 12:25:05 -0000	1.43
--- MultiTableEntityPersister.java	19 Dec 2002 11:29:03 -0000	1.44
***************
*** 953,962 ****
  		Type type = prop.getType();
  		typesByPropertyPath.put(path, type);
! 		if ( type.isEntityType() && ( (EntityType) type ).isOneToOne() ) {
  			columnNamesByPropertyPath.put( path, getIdentifierColumnNames() );
  		}
! 		else {
  			columnNamesByPropertyPath.put(path, names);
! 		}
  
  	}
--- 953,962 ----
  		Type type = prop.getType();
  		typesByPropertyPath.put(path, type);
! 		/*if ( type.isEntityType() && ( (EntityType) type ).isOneToOne() ) {
  			columnNamesByPropertyPath.put( path, getIdentifierColumnNames() );
  		}
! 		else {*/
  			columnNamesByPropertyPath.put(path, names);
! 		//}
  
  	}
***************
*** 1033,1037 ****
  			//remove leading " AND "
  			if ( ojw.toUpperCase().startsWith(" AND ") ) ojw = ojw.substring(5);
! 			return ojw;
  		//}
  		
--- 1033,1037 ----
  			//remove leading " AND "
  			if ( ojw.toUpperCase().startsWith(" AND ") ) ojw = ojw.substring(5);
! 			return ( ojw.trim().length()==0 ) ? null : ojw;
  		//}