[Nhibernate-commit] nhibernate/src/NHibernate/Persister EntityPersister.cs,1.26,1.27 NormalizedEntityPersister.cs,1.29,1.30

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

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

Modified Files:
	EntityPersister.cs NormalizedEntityPersister.cs 
Log Message:
Fixed problems with FOR UPDATE NOWAIT string that was being built.

Index: NormalizedEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/NormalizedEntityPersister.cs,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** NormalizedEntityPersister.cs	28 Aug 2004 17:16:21 -0000	1.29
--- NormalizedEntityPersister.cs	30 Aug 2004 02:49:06 -0000	1.30
***************
*** 530,534 ****
  				GenerateLockString(lockString, " FOR UPDATE") :
  				GenerateLockString(lockString, null);
! 			SqlString lockExclusiveNowaitString = dialect.SupportsForUpdate ? 
  				GenerateLockString(lockString, " FOR UPDATE NOWAIT") :
  				GenerateLockString(lockString, null);
--- 530,534 ----
  				GenerateLockString(lockString, " FOR UPDATE") :
  				GenerateLockString(lockString, null);
! 			SqlString lockExclusiveNowaitString = dialect.SupportsForUpdateNoWait ? 
  				GenerateLockString(lockString, " FOR UPDATE NOWAIT") :
  				GenerateLockString(lockString, null);

Index: EntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/EntityPersister.cs,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** EntityPersister.cs	28 Aug 2004 17:19:30 -0000	1.26
--- EntityPersister.cs	30 Aug 2004 02:49:06 -0000	1.27
***************
*** 357,361 ****
  				GenerateLockString(lockString, " FOR UPDATE") :
  				GenerateLockString(lockString, null);
! 			SqlString lockExclusiveNowaitString = dialect.SupportsForUpdate ? 
  				GenerateLockString(lockString, " FOR UPDATE NOWAIT") :
  				GenerateLockString(lockString, null);
--- 357,361 ----
  				GenerateLockString(lockString, " FOR UPDATE") :
  				GenerateLockString(lockString, null);
! 			SqlString lockExclusiveNowaitString = dialect.SupportsForUpdateNoWait ? 
  				GenerateLockString(lockString, " FOR UPDATE NOWAIT") :
  				GenerateLockString(lockString, null);
***************
*** 375,379 ****
  			
  			SqlString selectForUpdateNoWaitString = factory.Dialect.SupportsForUpdateNoWait ?
! 				GenerateSelectForUpdateString(" FOR UPDATE NO WAIT") : 
  				selectForUpdateString.Clone();
  
--- 375,379 ----
  			
  			SqlString selectForUpdateNoWaitString = factory.Dialect.SupportsForUpdateNoWait ?
! 				GenerateSelectForUpdateString(" FOR UPDATE NOWAIT") : 
  				selectForUpdateString.Clone();