[Nhibernate-commit] nhibernate/src/NHibernate/Persister AbstractEntityPersister.cs,1.16,1.17 EntityPersister.cs,1.14,1.15 NormalizedEntityPersister.cs,1.12,1.13

[Peter S. <sz...@us...>]

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

Modified Files:
	AbstractEntityPersister.cs EntityPersister.cs 
	NormalizedEntityPersister.cs 
Log Message:
I modified - a few thing :)


Index: NormalizedEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/NormalizedEntityPersister.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NormalizedEntityPersister.cs	10 Apr 2004 05:06:02 -0000	1.12
--- NormalizedEntityPersister.cs	15 Apr 2004 11:36:36 -0000	1.13
***************
*** 273,277 ****
  				foreach(Column col in prop.ColumnCollection ) {
  					propCols[columnIndex] = col.GetQuotedName(dialect);
! 					propAliases[columnIndex] = col.Alias + tab.UniqueInteger + StringHelper.Underscore;
  					columnIndex++;
  				}
--- 273,277 ----
  				foreach(Column col in prop.ColumnCollection ) {
  					propCols[columnIndex] = col.GetQuotedName(dialect);
! 					propAliases[columnIndex] = col.Alias(dialect) + tab.UniqueInteger + StringHelper.Underscore;
  					columnIndex++;
  				}
***************
*** 312,316 ****
  					coltables.Add(tabnum);
  					cols[l++] = col.GetQuotedName(dialect);
! 					aliases.Add( col.Alias + tab.UniqueInteger + StringHelper.Underscore );
  				}
  				propColumns.Add(cols);
--- 312,316 ----
  					coltables.Add(tabnum);
  					cols[l++] = col.GetQuotedName(dialect);
! 					aliases.Add( col.Alias(dialect) + tab.UniqueInteger + StringHelper.Underscore );
  				}
  				propColumns.Add(cols);
***************
*** 1137,1141 ****
  		public override string PropertySelectFragment(string alias, string suffix) {
  			string[] cols = subclassColumnClosure;
! 			SqlCommand.SelectFragment frag = new SqlCommand.SelectFragment()
  				.SetSuffix(suffix);
  			for (int i=0; i<cols.Length; i++) {
--- 1137,1141 ----
  		public override string PropertySelectFragment(string alias, string suffix) {
  			string[] cols = subclassColumnClosure;
! 			SqlCommand.SelectFragment frag = new SqlCommand.SelectFragment(factory.Dialect)
  				.SetSuffix(suffix);
  			for (int i=0; i<cols.Length; i++) {

Index: AbstractEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/AbstractEntityPersister.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AbstractEntityPersister.cs	10 Apr 2004 05:06:02 -0000	1.16
--- AbstractEntityPersister.cs	15 Apr 2004 11:36:36 -0000	1.17
***************
*** 103,107 ****
  			//TODO: fix this once the interface is changed from a string to SqlString
  			// this works now because there are no parameters in the select fragment string
! 			return new SqlCommand.SelectFragment()
  				.SetSuffix(suffix)
  				.AddColumns( name, IdentifierColumnNames )
--- 103,107 ----
  			//TODO: fix this once the interface is changed from a string to SqlString
  			// this works now because there are no parameters in the select fragment string
! 			return new SqlCommand.SelectFragment(dialect)
  				.SetSuffix(suffix)
  				.AddColumns( name, IdentifierColumnNames )

Index: EntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/EntityPersister.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** EntityPersister.cs	10 Apr 2004 05:06:02 -0000	1.14
--- EntityPersister.cs	15 Apr 2004 11:36:36 -0000	1.15
***************
*** 131,135 ****
  				int j=0;
  				foreach(Column col in prop.ColumnCollection) {
! 					colAliases[j] = col.Alias;
  					colNames[j] = col.GetQuotedName(dialect);
  					j++;
--- 131,135 ----
  				int j=0;
  				foreach(Column col in prop.ColumnCollection) {
! 					colAliases[j] = col.Alias(dialect);
  					colNames[j] = col.GetQuotedName(dialect);
  					j++;
***************
*** 160,164 ****
  				foreach( Column col in prop.ColumnCollection ) {
  					columns.Add( col.GetQuotedName(dialect) );
! 					aliases.Add( col.Alias );
  					cols[l++] = col.GetQuotedName(dialect);
  				}
--- 160,164 ----
  				foreach( Column col in prop.ColumnCollection ) {
  					columns.Add( col.GetQuotedName(dialect) );
! 					aliases.Add( col.Alias(dialect) );
  					cols[l++] = col.GetQuotedName(dialect);
  				}
***************
*** 293,298 ****
  			loaders.Add( LockMode.None, loader );
  			loaders.Add( LockMode.Read, loader );
! 			loaders.Add( LockMode.Upgrade, new SimpleEntityLoader(this, selectForUpdateString, LockMode.Upgrade));
! 			loaders.Add( LockMode.UpgradeNoWait, new SimpleEntityLoader(this, selectForUpdateNoWaitString, LockMode.UpgradeNoWait));
  
  		}
--- 293,298 ----
  			loaders.Add( LockMode.None, loader );
  			loaders.Add( LockMode.Read, loader );
! 			loaders.Add( LockMode.Upgrade, new SimpleEntityLoader(this, selectForUpdateString, LockMode.Upgrade, factory.Dialect));
! 			loaders.Add( LockMode.UpgradeNoWait, new SimpleEntityLoader(this, selectForUpdateNoWaitString, LockMode.UpgradeNoWait, factory.Dialect));
  
  		}
***************
*** 930,934 ****
  
  		public override string PropertySelectFragment(string name, string suffix) {
! 			SqlCommand.SelectFragment frag = new SqlCommand.SelectFragment()
  				.SetSuffix(suffix);
  			if ( HasSubclasses ) frag.AddColumn( name, DiscriminatorColumnName );
--- 930,934 ----
  
  		public override string PropertySelectFragment(string name, string suffix) {
! 			SqlCommand.SelectFragment frag = new SqlCommand.SelectFragment(factory.Dialect)
  				.SetSuffix(suffix);
  			if ( HasSubclasses ) frag.AddColumn( name, DiscriminatorColumnName );