[Nhibernate-commit] nhibernate/src/NHibernate/Mapping Column.cs,1.8,1.9 PersistentClass.cs,1.10,1.11

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

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

Modified Files:
	Column.cs PersistentClass.cs 
Log Message:
I modified - a few thing :)


Index: PersistentClass.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Mapping/PersistentClass.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PersistentClass.cs	13 Apr 2004 17:58:01 -0000	1.10
--- PersistentClass.cs	15 Apr 2004 11:36:36 -0000	1.11
***************
*** 194,209 ****
  		public abstract Value Key { get; set; } 
  
! 		public virtual void CreatePrimaryKey() 
! 		{
! 			PrimaryKey pk = new PrimaryKey();
! 			pk.Table = table;
! 			pk.Name = PKAlias.ToAliasString(table.Name); 
! 			table.PrimaryKey = pk;
! 
! 			foreach(Column col in Key.ColumnCollection) 
! 			{
! 				pk.AddColumn(col);
! 			}
! 		}
  
  		public abstract string Where { get; set; }
--- 194,209 ----
  		public abstract Value Key { get; set; } 
  
! //		public virtual void CreatePrimaryKey() 
! //		{
! //			PrimaryKey pk = new PrimaryKey();
! //			pk.Table = table;
! //			pk.Name = PKAlias.ToAliasString(table.Name, dialect); 
! //			table.PrimaryKey = pk;
! //
! //			foreach(Column col in Key.ColumnCollection) 
! //			{
! //				pk.AddColumn(col);
! //			}
! //		}
  
  		public abstract string Where { get; set; }

Index: Column.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Mapping/Column.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Column.cs	15 Apr 2004 09:30:15 -0000	1.8
--- Column.cs	15 Apr 2004 11:36:36 -0000	1.9
***************
*** 59,66 ****
  		}
  
! 		public string Alias 
  		{
- 			get 
- 			{	
  				if(quoted) 
  					return "y" + uniqueInteger.ToString() + StringHelper.Underscore;
--- 59,64 ----
  		}
  
! 		public string Alias(Dialect.Dialect d)
  		{
  				if(quoted) 
  					return "y" + uniqueInteger.ToString() + StringHelper.Underscore;
***************
*** 69,74 ****
  					return name;
  				else
! 					return (new Alias(10, uniqueInteger.ToString() + StringHelper.Underscore)).ToAliasString(name);
! 			}
  		}
  
--- 67,71 ----
  					return name;
  				else
! 					return (new Alias(10, uniqueInteger.ToString() + StringHelper.Underscore)).ToAliasString(name, d);
  		}