[Nhibernate-commit] nhibernate/src/NHibernate/Loader AbstractEntityLoader.cs,1.6,1.7 CollectionLoader.cs,1.6,1.7 Loader.cs,1.23,1.24 OneToManyLoader.cs,1.6,1.7 OuterJoinLoader.cs,1.11,1.12

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20937/NHibernate/Loader

Modified Files:
	AbstractEntityLoader.cs CollectionLoader.cs Loader.cs 
	OneToManyLoader.cs OuterJoinLoader.cs 
Log Message:
Renamed CreateLockModeArray to follow .net standards.  Trying to hunt 
down what is causing problem in QueryLockMode test.
Added ApplyLocks to PrepareQueryStatement

Index: CollectionLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/CollectionLoader.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CollectionLoader.cs	2 Apr 2004 15:55:48 -0000	1.6
--- CollectionLoader.cs	25 Jun 2004 20:33:02 -0000	1.7
***************
*** 77,80 ****
--- 77,81 ----
  
  			classPersisters = new ILoadable[joins];
+ 			lockModeArray = CreateLockModeArray(joins, LockMode.None);
  			for (int i=0; i<joins; i++) classPersisters[i] = (ILoadable) ((OuterJoinableAssociation) associations[i]).Subpersister;
  			this.collectionPersister = persister;

Index: AbstractEntityLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/AbstractEntityLoader.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AbstractEntityLoader.cs	19 May 2004 04:01:06 -0000	1.6
--- AbstractEntityLoader.cs	25 Jun 2004 20:33:02 -0000	1.7
***************
*** 61,65 ****
  
  			classPersisters = new ILoadable[joins+1];
! 			lockModeArray = createLockModeArray(joins+1, LockMode.None);
  			for (int i=0; i<joins; i++) classPersisters[i] = ((OuterJoinableAssociation)associations[i]).Subpersister;
  			classPersisters[joins] = persister;
--- 61,65 ----
  
  			classPersisters = new ILoadable[joins+1];
! 			lockModeArray = CreateLockModeArray(joins+1, LockMode.None);
  			for (int i=0; i<joins; i++) classPersisters[i] = ((OuterJoinableAssociation)associations[i]).Subpersister;
  			classPersisters[joins] = persister;
***************
*** 108,112 ****
  
  			classPersisters = new ILoadable[joins+1];
! 			lockModeArray = createLockModeArray(joins+1, LockMode.None);
  			for (int i=0; i<joins; i++) classPersisters[i] = ((OuterJoinableAssociation)associations[i]).Subpersister;
  			classPersisters[joins] = persister;
--- 108,112 ----
  
  			classPersisters = new ILoadable[joins+1];
! 			lockModeArray = CreateLockModeArray(joins+1, LockMode.None);
  			for (int i=0; i<joins; i++) classPersisters[i] = ((OuterJoinableAssociation)associations[i]).Subpersister;
  			classPersisters[joins] = persister;

Index: OuterJoinLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OuterJoinLoader.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** OuterJoinLoader.cs	30 Apr 2004 14:06:47 -0000	1.11
--- OuterJoinLoader.cs	25 Jun 2004 20:33:02 -0000	1.12
***************
*** 477,481 ****
  		}
  
! 		protected LockMode[] createLockModeArray(int length, LockMode lockMode) 
  		{
  			LockMode[] lmArray = new LockMode[length];
--- 477,481 ----
  		}
  
! 		protected LockMode[] CreateLockModeArray(int length, LockMode lockMode) 
  		{
  			LockMode[] lmArray = new LockMode[length];

Index: Loader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Loader.cs	23 Jun 2004 21:15:56 -0000	1.23
--- Loader.cs	25 Jun 2004 20:33:02 -0000	1.24
***************
*** 185,189 ****
  			else 
  			{
! 				st = PrepareQueryStatement( SQLString, values, types, namedParams, selection, false, session );
  			}
  			IDataReader rs = GetResultSet(st, selection, session);
--- 185,195 ----
  			else 
  			{
! 				// it is okay to convert to and from a string to SqlString and back to a string
! 				// because there are no parameters in the SqlString - even though there are parameters
! 				// in the string that contains sql.  SqlString will not parse out parameters - it assumes
! 				// a string passed to it is a string.
! 				st = PrepareQueryStatement( 
! 					ApplyLocks(new SqlString(SQLString), lockModes, session.Factory.Dialect).ToString()
! 					, values, types, namedParams, selection, false, session );
  			}
  			IDataReader rs = GetResultSet(st, selection, session);

Index: OneToManyLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OneToManyLoader.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OneToManyLoader.cs	2 Apr 2004 15:55:48 -0000	1.6
--- OneToManyLoader.cs	25 Jun 2004 20:33:02 -0000	1.7
***************
*** 83,87 ****
  
  			classPersisters = new ILoadable[joins+1];
! 			lockModeArray = createLockModeArray(joins+1, LockMode.None);
  			for (int i=0; i<joins; i++) classPersisters[i] = ((OuterJoinableAssociation) associations[i]).Subpersister;
  			classPersisters[joins] = persister;
--- 83,87 ----
  
  			classPersisters = new ILoadable[joins+1];
! 			lockModeArray = CreateLockModeArray(joins+1, LockMode.None);
  			for (int i=0; i<joins; i++) classPersisters[i] = ((OuterJoinableAssociation) associations[i]).Subpersister;
  			classPersisters[joins] = persister;