[Hibernate-commits] Hibernate2/src/net/sf/hibernate/loader CollectionLoader.java,1.8,1.9 Loader.java,1.10,1.11 OneToManyLoader.java,1.9,1.10

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

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

Modified Files:
	CollectionLoader.java Loader.java OneToManyLoader.java 
Log Message:
fixed a bug wrapping sorted collections
don't ever update mutable=false objects
added where attribute to collection mappings

Index: CollectionLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/CollectionLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CollectionLoader.java	1 Feb 2003 12:22:35 -0000	1.8
--- CollectionLoader.java	15 Feb 2003 01:00:53 -0000	1.9
***************
*** 38,41 ****
--- 38,44 ----
  		String alias = alias( persister.getQualifiedTableName(), 0 );
  		
+ 		String whereString="";
+ 		if ( persister.hasWhere() ) whereString = " and " + persister.getSQLWhereString(alias);
+ 		
  		List associations = walkTree(persister, alias, session);
  		
***************
*** 54,58 ****
  				new ConditionFragment().setTableAlias(alias)
  					.setCondition( persister.getKeyColumnNames(), "?" )
! 					.toFragmentString()
  			)
  			.setOuterJoins(
--- 57,62 ----
  				new ConditionFragment().setTableAlias(alias)
  					.setCondition( persister.getKeyColumnNames(), "?" )
! 					.toFragmentString() +
! 				whereString
  			)
  			.setOuterJoins(

Index: Loader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/Loader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Loader.java	3 Feb 2003 10:28:47 -0000	1.10
--- Loader.java	15 Feb 2003 01:00:54 -0000	1.11
***************
*** 105,117 ****
  		
  		final Key optionalObjectKey;
- 		//boolean success;
  		
  		if (optionalObject!=null) {
  			optionalObjectKey = new Key( optionalID, session.getPersister(optionalObject) );
- 			//success = false;
  		}
  		else {
  			optionalObjectKey = null;
- 			//success = true;
  		}
  		
--- 105,114 ----
***************
*** 257,262 ****
  						//its the given optional object
  						object=optionalObject;
- 						//success=true;
- 						
  					}
  					else {
--- 254,257 ----

Index: OneToManyLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/OneToManyLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OneToManyLoader.java	1 Feb 2003 12:22:35 -0000	1.9
--- OneToManyLoader.java	15 Feb 2003 01:00:54 -0000	1.10
***************
*** 46,49 ****
--- 46,52 ----
  		String collAlias = persister.getConcreteClassAlias(alias);
  		
+ 		String whereString="";
+ 		if ( collPersister.hasWhere() ) whereString = " and " + collPersister.getSQLWhereString(collAlias);
+ 		
  		List associations = walkTree(persister, alias, session);
  		
***************
*** 68,71 ****
--- 71,75 ----
  					.setCondition( collPersister.getKeyColumnNames(), "?" )
  					.toFragmentString()
+ 				+ whereString
  			)
  			.setOuterJoins(