nhibernate-commit — CVS Commits

[Nhibernate-commit] nhibernate/src/NHibernate/Sql Alias.cs,1.4,1.5

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

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

Modified Files:
	Alias.cs 
Log Message:
Still working on alias. Except for one testcase, everything looks ok.


Index: Alias.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Sql/Alias.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Alias.cs	15 Apr 2004 11:36:36 -0000	1.4
--- Alias.cs	15 Apr 2004 13:21:18 -0000	1.5
***************
*** 27,30 ****
--- 27,31 ----
  		public string ToAliasString(string sqlIdentifier, Dialect.Dialect dialect) 
  		{
+ 			return dialect.QuoteForAliasName(sqlIdentifier);
  			char begin = sqlIdentifier[0];
  			int quoteType = Dialect.Dialect.Quote.IndexOf(begin);
***************
*** 67,71 ****
  			if(quoteType >= 0) 
  			{
! 				unquoted = sqlIdentifier.Substring(1, sqlIdentifier.Length - 1);
  			}
  			else 
--- 68,72 ----
  			if(quoteType >= 0) 
  			{
! 				unquoted = sqlIdentifier.Substring(1, sqlIdentifier.Length - 2);
  			}
  			else 

[Nhibernate-commit] nhibernate/src/NHibernate.Test TestCase.cs,1.9,1.10

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

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

Modified Files:
	TestCase.cs 
Log Message:
Still working on alias. Except for one testcase, everything looks ok.


Index: TestCase.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/TestCase.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestCase.cs	12 Apr 2004 05:48:33 -0000	1.9
--- TestCase.cs	15 Apr 2004 13:21:19 -0000	1.10
***************
*** 16,20 ****
  		protected Configuration cfg;
  		protected ISessionFactory sessions;
- 		protected Dialect.Dialect dialect;
  
  		public void ExportSchema(string[] files) 
--- 16,19 ----
***************
*** 32,37 ****
  			}
  
- 			dialect = Dialect.Dialect.GetDialect();
- 
  			if(exportSchema) new SchemaExport(cfg).Create(true, true);
  
--- 31,34 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Util StringHelper.cs,1.9,1.10

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

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

Modified Files:
	StringHelper.cs 
Log Message:
Still working on alias. Except for one testcase, everything looks ok.


Index: StringHelper.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/StringHelper.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** StringHelper.cs	12 Apr 2004 05:38:19 -0000	1.9
--- StringHelper.cs	15 Apr 2004 13:21:19 -0000	1.10
***************
*** 15,18 ****
--- 15,20 ----
  		public const string SqlParameter = "?";
  
+ 		public static Dialect.Dialect Dialect;
+ 
  		[Obsolete("Use String.Join() instead of this method. It does the same thing")]
  		public static string Join(string separator, string[] strings) {
***************
*** 132,149 ****
  
  			char quote = name[0];
! 			bool nameEscaped = Dialect.Dialect.Quote.IndexOf(quote) > -1;
! 			StringBuilder nameBuffer = new StringBuilder(30);
! 
! 			if (nameEscaped) {
! 				nameBuffer.Append( name.Substring(1, name.Length-1) ).Append(suffix);
! 			} else {
! 				nameBuffer.Append(name).Append(suffix);
! 			}
! 
! 			if (nameEscaped) {
! 				nameBuffer.Insert(0, quote);
! 				nameBuffer.Append(quote);
! 			}
! 			return nameBuffer.ToString();
  		}
  
--- 134,141 ----
  
  			char quote = name[0];
! 			if (UnQuote(name) != name)
! 				return Dialect.QuoteForColumnName(UnQuote(name) + suffix);
! 			else
! 				return Dialect.QuoteForColumnName(name + suffix);
  		}
  
***************
*** 204,210 ****
  
  		public static string UnQuote(string name) {
! 			return ( Dialect.Dialect.Quote.IndexOf( name[0] ) > -1 )
! 				? name.Substring(1, name.Length-1)
! 				: name;
  		}
  
--- 196,200 ----
  
  		public static string UnQuote(string name) {
! 			return Dialect.UnQuote(name);
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate/Dialect Dialect.cs,1.25,1.26 MsSql2000Dialect.cs,1.8,1.9

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

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

Modified Files:
	Dialect.cs MsSql2000Dialect.cs 
Log Message:
Still working on alias. Except for one testcase, everything looks ok.


Index: Dialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/Dialect.cs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Dialect.cs	15 Apr 2004 11:36:35 -0000	1.25
--- Dialect.cs	15 Apr 2004 13:21:18 -0000	1.26
***************
*** 723,726 ****
--- 723,737 ----
  		}
  
+ 		
+ 		/// <summary>
+ 		/// Unquotes an already quoted name
+ 		/// </summary>
+ 		/// <param name="quoted">Quoted string</param>
+ 		/// <returns>Unquoted string</returns>
+ 		public virtual string UnQuote(string quoted)
+ 		{
+ 			return quoted;
+ 		}
+ 
  		/// <summary>
  		/// Quotes a name for being used as a tablename

Index: MsSql2000Dialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MsSql2000Dialect.cs	15 Apr 2004 09:30:15 -0000	1.8
--- MsSql2000Dialect.cs	15 Apr 2004 13:21:18 -0000	1.9
***************
*** 70,84 ****
  		public override string QuoteForTableName(string tableName)
  		{
! 			return "[" + tableName + "]";
  		}
  
  		public override string QuoteForAliasName(string aliasName)
  		{
! 			return "[" + aliasName + "]";
  		}
  
  		public override string QuoteForColumnName(string columnName)
  		{
! 			return "[" + columnName + "]";
  		}
  
--- 70,94 ----
  		public override string QuoteForTableName(string tableName)
  		{
! 			if (tableName[0] == '[') return tableName;
! 			return "[" + tableName.Replace("]","]]") + "]";
  		}
  
  		public override string QuoteForAliasName(string aliasName)
  		{
! 			if (aliasName[0] == '[') return aliasName;
! 			return "[" + aliasName.Replace("]","]]") + "]";
  		}
  
  		public override string QuoteForColumnName(string columnName)
  		{
! 			if (columnName[0] == '[') return columnName;
! 			return "[" + columnName.Replace("]","]]") + "]";
! 		}
! 
! 		public override string UnQuote(string quoted)
! 		{
! 			if (quoted[0] == '[')
! 				quoted = quoted.Substring(1,quoted.Length - 2);
! 			return quoted.Replace("]]","]");
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate/Cfg Binder.cs,1.14,1.15 Configuration.cs,1.10,1.11

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

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

Modified Files:
	Binder.cs Configuration.cs 
Log Message:
Still working on alias. Except for one testcase, everything looks ok.


Index: Binder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Binder.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Binder.cs	15 Apr 2004 11:51:42 -0000	1.14
--- Binder.cs	15 Apr 2004 13:21:17 -0000	1.15
***************
*** 16,19 ****
--- 16,20 ----
  		private static XmlNamespaceManager nsmgr;
  		private static readonly string nsPrefix = "hbm";
+ 		private static Dialect.Dialect dialect;
  
  		public static void BindClass(XmlNode node, PersistentClass model, Mappings mapping) {
***************
*** 110,114 ****
  		}
  
! 		public static void BindRootClass(XmlNode node, RootClass model, Mappings mappings) {
  
  			BindClass(node, model, mappings);
--- 111,117 ----
  		}
  
! 		public static void BindRootClass(XmlNode node, RootClass model, Mappings mappings, Dialect.Dialect d) {
!             
! 			dialect = d;
  
  			BindClass(node, model, mappings);
***************
*** 725,729 ****
  				} else if ( "joined-subclass".Equals(name) ) {
  					Subclass subclass = new Subclass(model);
! 					BindJoinedSubclass( subnode, subclass, mappings );
  					model.AddSubclass(subclass);
  					mappings.AddClass(subclass);
--- 728,732 ----
  				} else if ( "joined-subclass".Equals(name) ) {
  					Subclass subclass = new Subclass(model);
! 					BindJoinedSubclass( subnode, subclass, mappings);
  					model.AddSubclass(subclass);
  					mappings.AddClass(subclass);
***************
*** 847,851 ****
  		}
  
! 		public static void BindRoot(XmlDocument doc, Mappings model) {
  
  			XmlNode hmNode = doc.DocumentElement;
--- 850,854 ----
  		}
  
! 		public static void BindRoot(XmlDocument doc, Mappings model, Dialect.Dialect dialect) {
  
  			XmlNode hmNode = doc.DocumentElement;
***************
*** 867,871 ****
  			foreach(XmlNode n in hmNode.SelectNodes(nsPrefix + ":class", nsmgr) ) {
  				RootClass rootclass = new RootClass();
! 				Binder.BindRootClass(n, rootclass, model);
  				model.AddClass(rootclass);
  			}
--- 870,874 ----
  			foreach(XmlNode n in hmNode.SelectNodes(nsPrefix + ":class", nsmgr) ) {
  				RootClass rootclass = new RootClass();
! 				Binder.BindRootClass(n, rootclass, model, dialect);
  				model.AddClass(rootclass);
  			}

Index: Configuration.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Configuration.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Configuration.cs	13 Apr 2004 02:05:03 -0000	1.10
--- Configuration.cs	15 Apr 2004 13:21:17 -0000	1.11
***************
*** 173,177 ****
  		private void Add(XmlDocument doc) {
  			try {
! 				Binder.BindRoot( doc, CreateMappings() );
  			} 
  			catch (MappingException me) {
--- 173,178 ----
  		private void Add(XmlDocument doc) {
  			try {
! 				StringHelper.Dialect = Dialect.Dialect.GetDialect(properties);
! 				Binder.BindRoot( doc, CreateMappings(), StringHelper.Dialect);
  			} 
  			catch (MappingException me) {

[Nhibernate-commit] nhibernate/src/NHibernate/Mapping PersistentClass.cs,1.11,1.12

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

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

Modified Files:
	PersistentClass.cs 
Log Message:
This alias-dialect thing is pfhhhh.


Index: PersistentClass.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Mapping/PersistentClass.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PersistentClass.cs	15 Apr 2004 11:36:36 -0000	1.11
--- PersistentClass.cs	15 Apr 2004 11:51:42 -0000	1.12
***************
*** 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; }
--- 194,209 ----
  		public abstract Value Key { get; set; } 
  
! 		public virtual void CreatePrimaryKey(Dialect.Dialect dialect) 
! 		{
! 			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; }

[Nhibernate-commit] nhibernate/src/NHibernate/Cfg Binder.cs,1.13,1.14

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

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

Modified Files:
	Binder.cs 
Log Message:
This alias-dialect thing is pfhhhh.


Index: Binder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Binder.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Binder.cs	12 Apr 2004 05:43:26 -0000	1.13
--- Binder.cs	15 Apr 2004 11:51:42 -0000	1.14
***************
*** 103,107 ****
  
  			model.Key.Type = model.Identifier.Type;
! 			model.CreatePrimaryKey();
  			ForeignKey fk = mytable.CreateForeignKey( model.Key.ConstraintColumns );
  			fk.ReferencedClass = model.Superclass.PersistentClazz;
--- 103,107 ----
  
  			model.Key.Type = model.Identifier.Type;
! 			model.CreatePrimaryKey(dialect);
  			ForeignKey fk = mytable.CreateForeignKey( model.Key.ConstraintColumns );
  			fk.ReferencedClass = model.Superclass.PersistentClazz;
***************
*** 146,150 ****
  
  			//POLYMORPHISM
! 			XmlAttribute polyNode = node.Attributes["poylmorphism"];
  			model.IsExplicitPolymorphism = (polyNode!=null) && polyNode.Value.Equals("explicit");
  
--- 146,150 ----
  
  			//POLYMORPHISM
! 			XmlAttribute polyNode = node.Attributes["polymorphism"];
  			model.IsExplicitPolymorphism = (polyNode!=null) && polyNode.Value.Equals("explicit");
  
***************
*** 224,228 ****
  			}
  
! 			model.CreatePrimaryKey();
  
  			PropertiesFromXML(node, model, mappings);
--- 224,228 ----
  			}
  
! 			model.CreatePrimaryKey(dialect);
  
  			PropertiesFromXML(node, model, mappings);

[Nhibernate-commit] nhibernate/src/NHibernate/Loader Loader.cs,1.16,1.17 OuterJoinLoader.cs,1.9,1.10 SimpleEntityLoader.cs,1.5,1.6

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

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

Modified Files:
	Loader.cs OuterJoinLoader.cs SimpleEntityLoader.cs 
Log Message:
I modified - a few thing :)


Index: OuterJoinLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OuterJoinLoader.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OuterJoinLoader.cs	2 Apr 2004 15:55:48 -0000	1.9
--- OuterJoinLoader.cs	15 Apr 2004 11:36:36 -0000	1.10
***************
*** 35,44 ****
  		protected SqlString sqlString;
  		protected string[] suffixes;
- 		private Dialect.Dialect dialect;
  
  		
! 		public OuterJoinLoader(Dialect.Dialect dialect) 
  		{
- 			this.dialect = dialect;
  		}
  
--- 35,42 ----
  		protected SqlString sqlString;
  		protected string[] suffixes;
  
  		
! 		public OuterJoinLoader(Dialect.Dialect dialect) : base(dialect)
  		{
  		}
  
***************
*** 442,446 ****
  
  			//TODO: H2.0.3 - changes tableName to lower case - don't know why it is needed...
! 			return (new Alias(10, n.ToString() + StringHelper.Underscore)).ToAliasString(tableName);
  		}
  
--- 440,444 ----
  
  			//TODO: H2.0.3 - changes tableName to lower case - don't know why it is needed...
! 			return (new Alias(10, n.ToString() + StringHelper.Underscore)).ToAliasString(tableName, dialect);
  		}
  

Index: Loader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Loader.cs	2 Apr 2004 15:55:48 -0000	1.16
--- Loader.cs	15 Apr 2004 11:36:36 -0000	1.17
***************
*** 25,28 ****
--- 25,34 ----
  	{
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(Loader));
+ 		public Dialect.Dialect dialect;
+ 
+ 		protected Loader(Dialect.Dialect dialect)
+ 		{
+ 			this.dialect = dialect;
+ 		}
  
  		/// <summary>
***************
*** 879,883 ****
  		private string[] GetKeyAliases(string suffix, ILoadable persister) 
  		{
! 			return new Alias(suffix).ToUnquotedAliasStrings(persister.IdentifierColumnNames);
  		}
  
--- 885,889 ----
  		private string[] GetKeyAliases(string suffix, ILoadable persister) 
  		{
! 			return new Alias(suffix).ToUnquotedAliasStrings(persister.IdentifierColumnNames, dialect);
  		}
  
***************
*** 888,892 ****
  			for(int i = 0; i < size; i++) 
  			{
! 				result[i] = new Alias(suffix).ToUnquotedAliasStrings(persister.GetPropertyColumnNames(i));
  			}
  			return result;
--- 894,898 ----
  			for(int i = 0; i < size; i++) 
  			{
! 				result[i] = new Alias(suffix).ToUnquotedAliasStrings(persister.GetPropertyColumnNames(i), dialect);
  			}
  			return result;
***************
*** 896,900 ****
  		{
  			return persister.HasSubclasses ?
! 				new Alias(suffix).ToUnquotedAliasString(persister.DiscriminatorColumnName) : null;
  		}
  
--- 902,906 ----
  		{
  			return persister.HasSubclasses ?
! 				new Alias(suffix).ToUnquotedAliasString(persister.DiscriminatorColumnName, dialect) : null;
  		}
  

Index: SimpleEntityLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/SimpleEntityLoader.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SimpleEntityLoader.cs	2 Apr 2004 15:55:48 -0000	1.5
--- SimpleEntityLoader.cs	15 Apr 2004 11:36:36 -0000	1.6
***************
*** 25,29 ****
  		private string[] NoSuffix = new string[] { String.Empty };
  
! 		public SimpleEntityLoader(ILoadable persister, SqlString sqlString, LockMode lockMode) 
  		{
  			this.persister = new ILoadable[] { persister };
--- 25,29 ----
  		private string[] NoSuffix = new string[] { String.Empty };
  
! 		public SimpleEntityLoader(ILoadable persister, SqlString sqlString, LockMode lockMode, Dialect.Dialect d) : base(d)
  		{
  			this.persister = new ILoadable[] { persister };

[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 );

[Nhibernate-commit] nhibernate/src/NHibernate/Hql ClauseParser.cs,1.4,1.5 FilterTranslator.cs,1.5,1.6 HavingParser.cs,1.4,1.5 QueryTranslator.cs,1.23,1.24 WhereParser.cs,1.10,1.11

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

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

Modified Files:
	ClauseParser.cs FilterTranslator.cs HavingParser.cs 
	QueryTranslator.cs WhereParser.cs 
Log Message:
I modified - a few thing :)


Index: ClauseParser.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/ClauseParser.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ClauseParser.cs	14 Apr 2004 11:35:53 -0000	1.4
--- ClauseParser.cs	15 Apr 2004 11:36:35 -0000	1.5
***************
*** 51,55 ****
  				{
  					EndChild(q);
! 					child = new WhereParser();
  					child.Start(q);
  				} 
--- 51,55 ----
  				{
  					EndChild(q);
! 					child = new WhereParser(q.dialect);
  					child.Start(q);
  				} 
***************
*** 63,67 ****
  				{
  					EndChild(q);
! 					child = new HavingParser();
  					child.Start(q);
  				} 
--- 63,67 ----
  				{
  					EndChild(q);
! 					child = new HavingParser(q.dialect);
  					child.Start(q);
  				} 

Index: WhereParser.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/WhereParser.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** WhereParser.cs	14 Apr 2004 12:34:00 -0000	1.10
--- WhereParser.cs	15 Apr 2004 11:36:35 -0000	1.11
***************
*** 33,39 ****
  		private static StringCollection booleanOperators = new StringCollection(); //tokens that would indicate a sub expression is a boolean expression
  		private static IDictionary negations = new Hashtable();
  
! 		public WhereParser()
  		{
  			pathExpressionParser.UseThetaStyleJoin = true;
  		}
--- 33,41 ----
  		private static StringCollection booleanOperators = new StringCollection(); //tokens that would indicate a sub expression is a boolean expression
  		private static IDictionary negations = new Hashtable();
+ 		private Dialect.Dialect d;
  
! 		public WhereParser(Dialect.Dialect d)
  		{
+ 			this.d = d;
  			pathExpressionParser.UseThetaStyleJoin = true;
  		}
***************
*** 244,248 ****
  				if (bracketsSinceSelect == - 1) 
  				{
! 					QueryTranslator subq = new QueryTranslator();
  					try 
  					{
--- 246,250 ----
  				if (bracketsSinceSelect == - 1) 
  				{
! 					QueryTranslator subq = new QueryTranslator(d);
  					try 
  					{

Index: QueryTranslator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/QueryTranslator.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** QueryTranslator.cs	14 Apr 2004 14:48:47 -0000	1.23
--- QueryTranslator.cs	15 Apr 2004 11:36:35 -0000	1.24
***************
*** 84,88 ****
  		/// Construct a query translator
  		/// </summary>
! 		public QueryTranslator() 
  		{
  		}
--- 84,88 ----
  		/// Construct a query translator
  		/// </summary>
! 		public QueryTranslator(Dialect.Dialect d) : base(d)
  		{
  		}

Index: HavingParser.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/HavingParser.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HavingParser.cs	14 Apr 2004 11:35:53 -0000	1.4
--- HavingParser.cs	15 Apr 2004 11:36:35 -0000	1.5
***************
*** 8,11 ****
--- 8,14 ----
  	public class HavingParser : WhereParser {
  		
+ 		public HavingParser(Dialect.Dialect d) : base(d)
+ 		{
+ 		}
  		protected override void AppendToken(QueryTranslator q, string token) {
  			q.AppendHavingToken(token);

Index: FilterTranslator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/FilterTranslator.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FilterTranslator.cs	14 Apr 2004 11:35:53 -0000	1.5
--- FilterTranslator.cs	15 Apr 2004 11:36:35 -0000	1.6
***************
*** 9,12 ****
--- 9,16 ----
  	public class FilterTranslator : QueryTranslator {
  		
+ 		public FilterTranslator(Dialect.Dialect d) : base(d)
+ 		{
+ 		}
+ 
  		/// <summary> Compile a filter. This method may be called multiple
  		/// times. Subsequent invocations are no-ops.

[Nhibernate-commit] nhibernate/src/NHibernate/Dialect Dialect.cs,1.24,1.25 MySQLDialect.cs,1.13,1.14

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

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

Modified Files:
	Dialect.cs MySQLDialect.cs 
Log Message:
I modified - a few thing :)


Index: Dialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/Dialect.cs,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Dialect.cs	15 Apr 2004 09:30:14 -0000	1.24
--- Dialect.cs	15 Apr 2004 11:36:35 -0000	1.25
***************
*** 339,343 ****
  		public virtual SqlCommand.CaseFragment CreateCaseFragment() 
  		{
! 			return new SqlCommand.ANSICaseFragment();
  		}
  
--- 339,343 ----
  		public virtual SqlCommand.CaseFragment CreateCaseFragment() 
  		{
! 			return new SqlCommand.ANSICaseFragment(this);
  		}
  

Index: MySQLDialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/MySQLDialect.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MySQLDialect.cs	10 Apr 2004 05:06:02 -0000	1.13
--- MySQLDialect.cs	15 Apr 2004 11:36:35 -0000	1.14
***************
*** 69,90 ****
  		}
  			
- 		/// <summary>
- 		/// The character used to close a Quoted identifier
- 		/// </summary>
- 		/// <value>MySql overrides Dialects default value with '`'</value>
- 		public override char CloseQuote
- 		{
- 			get { return '`'; }
- 		}
- 
- 		/// <summary>
- 		/// The character used to open a Quoted identifier
- 		/// </summary>
- 		/// <value>MySql overrides Dialects default value with '`'</value>
- 		public override char OpenQuote
- 		{
- 			get { return '`'; }
- 		}
- 
  		private string SqlTypeToString(string name, int length) 
  		{
--- 69,72 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Impl SessionFactoryImpl.cs,1.13,1.14

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

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

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


Index: SessionFactoryImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionFactoryImpl.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SessionFactoryImpl.cs	13 Apr 2004 14:59:17 -0000	1.13
--- SessionFactoryImpl.cs	15 Apr 2004 11:36:35 -0000	1.14
***************
*** 327,331 ****
  			}
  			*/
! 			QueryTranslator q = new QueryTranslator();
  			q.Compile(this, query, querySubstitutions, shallow);
  			
--- 327,331 ----
  			}
  			*/
! 			QueryTranslator q = new QueryTranslator(dialect);
  			q.Compile(this, query, querySubstitutions, shallow);
  			
***************
*** 340,344 ****
  			if ( q==null ) 
  			{
! 				q = new FilterTranslator();
  				Put(cacheKey, q);
  			}
--- 340,344 ----
  			if ( q==null ) 
  			{
! 				q = new FilterTranslator(dialect);
  				Put(cacheKey, q);
  			}

[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);
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate/SqlCommand ANSICaseFragment.cs,1.1,1.2 DecodeCaseFragment.cs,1.1,1.2 SelectFragment.cs,1.2,1.3

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

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

Modified Files:
	ANSICaseFragment.cs DecodeCaseFragment.cs SelectFragment.cs 
Log Message:
I modified - a few thing :)


Index: SelectFragment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SelectFragment.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SelectFragment.cs	9 Mar 2004 13:19:19 -0000	1.2
--- SelectFragment.cs	15 Apr 2004 11:36:36 -0000	1.3
***************
*** 17,20 ****
--- 17,26 ----
  		private IList aliases = new ArrayList();
  		private IList columnAliases = new ArrayList();
+ 		private Dialect.Dialect dialect;
+ 
+ 		public SelectFragment(Dialect.Dialect d)
+ 		{
+ 			this.dialect = d;
+ 		}
  
  		public SelectFragment SetSuffix(string suffix) 
***************
*** 83,87 ****
  				buf.Append(col)
  					.Append(" as ")
! 					.Append( new Alias(suffix).ToAliasString(columnAlias) );
  			}
  			return new SqlString(buf.ToString());
--- 89,93 ----
  				buf.Append(col)
  					.Append(" as ")
! 					.Append( new Alias(suffix).ToAliasString(columnAlias, dialect) );
  			}
  			return new SqlString(buf.ToString());

Index: ANSICaseFragment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/ANSICaseFragment.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ANSICaseFragment.cs	4 Mar 2004 04:10:15 -0000	1.1
--- ANSICaseFragment.cs	15 Apr 2004 11:36:36 -0000	1.2
***************
*** 15,18 ****
--- 15,24 ----
  	public class ANSICaseFragment : CaseFragment
  	{
+ 		private Dialect.Dialect dialect;
+ 
+ 		public ANSICaseFragment(Dialect.Dialect dialect)
+ 		{
+ 			this.dialect = dialect;
+ 		}
  
  		private string returnColumnName;
***************
*** 28,32 ****
  		public override CaseFragment SetReturnColumnName(string returnColumnName, string suffix) 
  		{
! 			return SetReturnColumnName( new Alias(suffix).ToAliasString( returnColumnName ) );
  		}
  
--- 34,38 ----
  		public override CaseFragment SetReturnColumnName(string returnColumnName, string suffix) 
  		{
! 			return SetReturnColumnName( new Alias(suffix).ToAliasString( returnColumnName, dialect ) );
  		}
  

Index: DecodeCaseFragment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/DecodeCaseFragment.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DecodeCaseFragment.cs	4 Mar 2004 04:10:15 -0000	1.1
--- DecodeCaseFragment.cs	15 Apr 2004 11:36:36 -0000	1.2
***************
*** 13,16 ****
--- 13,23 ----
  	public class DecodeCaseFragment : CaseFragment 
  	{
+ 		private Dialect.Dialect dialect;
+ 
+ 		public DecodeCaseFragment(Dialect.Dialect dialect)
+ 		{
+ 			this.dialect = dialect;
+ 		}
+ 
  		private string returnColumnName;
  		private IList cases = new ArrayList();
***************
*** 24,28 ****
  		public override CaseFragment SetReturnColumnName(string returnColumnName, string suffix) 
  		{
! 			return SetReturnColumnName( new Alias(suffix).ToAliasString(returnColumnName) );
  		}
  
--- 31,35 ----
  		public override CaseFragment SetReturnColumnName(string returnColumnName, string suffix) 
  		{
! 			return SetReturnColumnName( new Alias(suffix).ToAliasString(returnColumnName, dialect) );
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate/Sql Alias.cs,1.3,1.4

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

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

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


Index: Alias.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Sql/Alias.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Alias.cs	15 Apr 2004 09:30:15 -0000	1.3
--- Alias.cs	15 Apr 2004 11:36:36 -0000	1.4
***************
*** 25,29 ****
  		}
  
! 		public string ToAliasString(string sqlIdentifier) 
  		{
  			char begin = sqlIdentifier[0];
--- 25,29 ----
  		}
  
! 		public string ToAliasString(string sqlIdentifier, Dialect.Dialect dialect) 
  		{
  			char begin = sqlIdentifier[0];
***************
*** 59,64 ****
  		}
  
! 
! 		public string ToUnquotedAliasString(string sqlIdentifier)
  		{
  			char begin = sqlIdentifier[0];
--- 59,63 ----
  		}
  
! 		public string ToUnquotedAliasString(string sqlIdentifier, Dialect.Dialect dialect)
  		{
  			char begin = sqlIdentifier[0];
***************
*** 85,94 ****
  		}
  
! 		public string[] ToUnquotedAliasStrings(string[] sqlIdentifiers) 
  		{
  			string[] aliases = new string[sqlIdentifiers.Length];
  			for(int i = 0; i < sqlIdentifiers.Length; i++) 
  			{
! 				aliases[i] = ToUnquotedAliasString(sqlIdentifiers[i]);
  			}
  
--- 84,93 ----
  		}
  
! 		public string[] ToUnquotedAliasStrings(string[] sqlIdentifiers, Dialect.Dialect dialect) 
  		{
  			string[] aliases = new string[sqlIdentifiers.Length];
  			for(int i = 0; i < sqlIdentifiers.Length; i++) 
  			{
! 				aliases[i] = ToUnquotedAliasString(sqlIdentifiers[i], dialect);
  			}
  
***************
*** 97,101 ****
  
  		
! 		public string[] ToAliasStrings(string[] sqlIdentifiers) 
  		{
  			string[] aliases = new string[ sqlIdentifiers.Length ];
--- 96,100 ----
  
  		
! 		public string[] ToAliasStrings(string[] sqlIdentifiers, Dialect.Dialect dialect) 
  		{
  			string[] aliases = new string[ sqlIdentifiers.Length ];
***************
*** 103,107 ****
  			for ( int i=0; i<sqlIdentifiers.Length; i++ ) 
  			{
! 				aliases[i] = ToAliasString(sqlIdentifiers[i]);
  			}
  			return aliases;
--- 102,106 ----
  			for ( int i=0; i<sqlIdentifiers.Length; i++ ) 
  			{
! 				aliases[i] = ToAliasString(sqlIdentifiers[i], dialect);
  			}
  			return aliases;

[Nhibernate-commit] nhibernate/src/NHibernate/Collection CollectionPersister.cs,1.16,1.17

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

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

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


Index: CollectionPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/CollectionPersister.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CollectionPersister.cs	10 Apr 2004 05:06:01 -0000	1.16
--- CollectionPersister.cs	15 Apr 2004 11:36:35 -0000	1.17
***************
*** 386,390 ****
  
  		public string SelectClauseFragment(string alias) {
! 			SqlCommand.SelectFragment frag = new SqlCommand.SelectFragment()
  				.SetSuffix(String.Empty)
  				.AddColumns(alias, elementColumnNames);
--- 386,390 ----
  
  		public string SelectClauseFragment(string alias) {
! 			SqlCommand.SelectFragment frag = new SqlCommand.SelectFragment(factory.Dialect)
  				.SetSuffix(String.Empty)
  				.AddColumns(alias, elementColumnNames);

[Nhibernate-commit] nhibernate/src/NHibernate.Test FooBarTest.cs,1.8,1.9

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

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

Modified Files:
	FooBarTest.cs 
Log Message:
Solved some quoting problem, found problem with Alias class.


Index: FooBarTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FooBarTest.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FooBarTest.cs	14 Apr 2004 08:38:51 -0000	1.8
--- FooBarTest.cs	15 Apr 2004 09:30:16 -0000	1.9
***************
*** 35,39 ****
  
  		[Test]
! 		[Ignore("Fetch keyword is missing from HQL")]
  		public void FetchInitializedCollection()
  		{
--- 35,39 ----
  
  		[Test]
! 		//[Ignore("Generated SQL contains bad quoting")]
  		public void FetchInitializedCollection()
  		{

[Nhibernate-commit] nhibernate/src/NHibernate.Test/SqlCommandTest TemplateFixture.cs,1.1,1.2

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

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2046/NHibernate.Test/SqlCommandTest

Modified Files:
	TemplateFixture.cs 
Log Message:
Solved some quoting problem, found problem with Alias class.


Index: TemplateFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/TemplateFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TemplateFixture.cs	12 Apr 2004 05:39:10 -0000	1.1
--- TemplateFixture.cs	15 Apr 2004 09:30:16 -0000	1.2
***************
*** 27,31 ****
  			string whereFragment = "column_name = 'string value' and `backtick` = 1";
  
! 			string expectedFragment = "$PlaceHolder.column_name = 'string value' and $PlaceHolder.[backtick] = 1";
  
  			Assert.AreEqual( expectedFragment, Template.RenderWhereStringTemplate(whereFragment, dialect) );
--- 27,31 ----
  			string whereFragment = "column_name = 'string value' and `backtick` = 1";
  
! 			string expectedFragment = "$PlaceHolder.[column_name] = 'string value' and $PlaceHolder.[backtick] = 1";
  
  			Assert.AreEqual( expectedFragment, Template.RenderWhereStringTemplate(whereFragment, dialect) );

[Nhibernate-commit] nhibernate/src/NHibernate/SqlCommand Template.cs,1.2,1.3

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

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

Modified Files:
	Template.cs 
Log Message:
Solved some quoting problem, found problem with Alias class.


Index: Template.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/Template.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Template.cs	14 Apr 2004 14:48:47 -0000	1.2
--- Template.cs	15 Apr 2004 09:30:16 -0000	1.3
***************
*** 189,202 ****
  		}
  
- 		[Obsolete("Should use Quote functions")]
  		private static string Quote(string column, Dialect.Dialect dialect) 
  		{
  			if ( column[0] == '`' ) 
  			{
! 				return dialect.OpenQuote + column.Substring(1, column.Length - 2) + dialect.CloseQuote;
  			}
  			else 
  			{
! 				return column;
  			}
  		}
--- 189,204 ----
  		}
  
  		private static string Quote(string column, Dialect.Dialect dialect) 
  		{
+ 
  			if ( column[0] == '`' ) 
  			{
! 				if (column[column.Length -1] != '`')
! 					throw new ArgumentException("missing ` in column " + column);
! 				return dialect.QuoteForAliasName(column.Substring(1, column.Length - 2));
  			}
  			else 
  			{
! 				return dialect.QuoteForAliasName(column);
  			}
  		}

[Nhibernate-commit] nhibernate/src/NHibernate/Sql Alias.cs,1.2,1.3

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

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

Modified Files:
	Alias.cs 
Log Message:
Solved some quoting problem, found problem with Alias class.


Index: Alias.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Sql/Alias.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Alias.cs	2 Apr 2004 14:12:20 -0000	1.2
--- Alias.cs	15 Apr 2004 09:30:15 -0000	1.3
***************
*** 51,55 ****
  			{
  				char endQuote = Dialect.Dialect.ClosedQuote[quoteType];
! 				return endQuote + unquoted + endQuote;
  			}
  			else 
--- 51,55 ----
  			{
  				char endQuote = Dialect.Dialect.ClosedQuote[quoteType];
! 				return begin + unquoted + endQuote;
  			}
  			else 

[Nhibernate-commit] nhibernate/src/NHibernate/Mapping Column.cs,1.7,1.8 Table.cs,1.11,1.12

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

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

Modified Files:
	Column.cs Table.cs 
Log Message:
Solved some quoting problem, found problem with Alias class.


Index: Table.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Mapping/Table.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Table.cs	14 Apr 2004 14:48:47 -0000	1.11
--- Table.cs	15 Apr 2004 09:30:15 -0000	1.12
***************
*** 70,79 ****
  		}
  
- 		[Obsolete("Should use Quote functions")]
  		public string GetQuotedName(Dialect.Dialect dialect) 
  		{
! 			return quoted ? 
! 				dialect.OpenQuote + name + dialect.CloseQuote :
! 				name;
  		}
  
--- 70,76 ----
  		}
  
  		public string GetQuotedName(Dialect.Dialect dialect) 
  		{
! 			return dialect.QuoteForTableName(name);
  		}
  

Index: Column.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Mapping/Column.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Column.cs	14 Apr 2004 14:48:47 -0000	1.7
--- Column.cs	15 Apr 2004 09:30:15 -0000	1.8
***************
*** 54,63 ****
  		}
  
- 		[Obsolete("Should use Quote functions")]
  		public string GetQuotedName(Dialect.Dialect d) 
  		{
! 			return quoted ?
! 				d.OpenQuote + name + d.CloseQuote :
! 				name;
  		}
  
--- 54,60 ----
  		}
  
  		public string GetQuotedName(Dialect.Dialect d) 
  		{
! 			return d.QuoteForColumnName(name);
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate/Dialect Dialect.cs,1.23,1.24 MsSql2000Dialect.cs,1.7,1.8

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

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

Modified Files:
	Dialect.cs MsSql2000Dialect.cs 
Log Message:
Solved some quoting problem, found problem with Alias class.


Index: Dialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/Dialect.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Dialect.cs	14 Apr 2004 14:48:46 -0000	1.23
--- Dialect.cs	15 Apr 2004 09:30:14 -0000	1.24
***************
*** 728,732 ****
  		/// <param name="tableName">Name of the table</param>
  		/// <returns>Quoted name</returns>
! 		protected virtual string QuoteForTableName(string tableName)
  		{
  			return tableName;
--- 728,732 ----
  		/// <param name="tableName">Name of the table</param>
  		/// <returns>Quoted name</returns>
! 		public virtual string QuoteForTableName(string tableName)
  		{
  			return tableName;
***************
*** 739,743 ****
  		/// <param name="columnName">Name of the column</param>
  		/// <returns>Quoted name</returns>
! 		protected virtual string QuoteForColumnName(string columnName)
  		{
  			return QuoteForTableName(columnName);
--- 739,743 ----
  		/// <param name="columnName">Name of the column</param>
  		/// <returns>Quoted name</returns>
! 		public virtual string QuoteForColumnName(string columnName)
  		{
  			return QuoteForTableName(columnName);
***************
*** 750,754 ****
  		/// <param name="columnName">Name of the alias</param>
  		/// <returns>Quoted name</returns>
! 		protected virtual string QuoteForAliasName(string aliasName)
  		{
  			return QuoteForTableName(aliasName);
--- 750,754 ----
  		/// <param name="columnName">Name of the alias</param>
  		/// <returns>Quoted name</returns>
! 		public virtual string QuoteForAliasName(string aliasName)
  		{
  			return QuoteForTableName(aliasName);

Index: MsSql2000Dialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MsSql2000Dialect.cs	10 Apr 2004 05:06:02 -0000	1.7
--- MsSql2000Dialect.cs	15 Apr 2004 09:30:15 -0000	1.8
***************
*** 67,89 ****
  			get { return "@"; }
  		}						
! 			
! 		/// <summary>
! 		/// The character used to close a Quoted identifier
! 		/// </summary>
! 		/// <value>MsSql2000 overrides Dialects default value with ']'</value>
! 		public override char CloseQuote
  		{
! 			get { return ']'; }
  		}
  
! 		/// <summary>
! 		/// The character used to open a Quoted identifier
! 		/// </summary>
! 		/// <value>MsSql2000 overrides Dialects default value with '['</value>
! 		public override char OpenQuote
  		{
! 			get { return '['; }
  		}
  
  
  		private string SqlTypeToString(string name, int length) 
--- 67,85 ----
  			get { return "@"; }
  		}						
! 
! 		public override string QuoteForTableName(string tableName)
  		{
! 			return "[" + tableName + "]";
  		}
  
! 		public override string QuoteForAliasName(string aliasName)
  		{
! 			return "[" + aliasName + "]";
  		}
  
+ 		public override string QuoteForColumnName(string columnName)
+ 		{
+ 			return "[" + columnName + "]";
+ 		}
  
  		private string SqlTypeToString(string name, int length) 

[Nhibernate-commit] nhibernate/src/NHibernate/Collection Bag.cs,1.2,1.3

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

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

Modified Files:
	Bag.cs 
Log Message:
Fixed problem initializing the Bag.

Index: Bag.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/Bag.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Bag.cs	9 Apr 2004 12:37:55 -0000	1.2
--- Bag.cs	14 Apr 2004 18:10:55 -0000	1.3
***************
*** 74,84 ****
  		{
  			object elementIdentifier = persister.ReadElementIdentifier(reader, owner, session);
! 			int index = (int) persister.ReadIndex(reader, session);
! 			for (int i=bag.Count; i<=index; i++) 
! 			{
! 				bag.Insert(i, null);
! 				bagIdentifiers.Insert(i , null);
! 			}
! 			bagIdentifiers[index] = elementIdentifier;
  			return elementIdentifier;
  		}
--- 74,80 ----
  		{
  			object elementIdentifier = persister.ReadElementIdentifier(reader, owner, session);
! 			int index = bag.Add(null);
! 			bagIdentifiers.Insert(index, elementIdentifier);
! 			
  			return elementIdentifier;
  		}

[Nhibernate-commit] nhibernate/src/NHibernate.Test BasicTypes.cs,1.5,1.6

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

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

Modified Files:
	BasicTypes.cs 
Log Message:
Added test for <bag> mapping.

Index: BasicTypes.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/BasicTypes.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BasicTypes.cs	22 Mar 2004 04:35:36 -0000	1.5
--- BasicTypes.cs	14 Apr 2004 18:09:41 -0000	1.6
***************
*** 45,48 ****
--- 45,49 ----
  
  			bc[index].Int32Array[1] = 15;
+ 			bc[index].StringBag[0] = "Replaced Spot 0";
  			bc[index].StringArray[2] = "Replaced Spot 2";
  			bc[index].StringList[0] = "Replaced Spot 0";
***************
*** 629,632 ****
--- 630,718 ----
  
  		[Test]
+ 		public void TestBagCRUD() 
+ 		{
+ 			int maxIndex = 5;
+ 			ISession[] s = new ISession[maxIndex];
+ 			ITransaction[] t = new ITransaction[maxIndex];
+ 			BasicClass[] bc = new BasicClass[maxIndex];
+ 
+ 			int index = 0;
+ 			int id = 1;
+ 
+ 			bc[index] = InsertBasicClass(id);
+ 
+ 			index++;
+ 
+ 			// modify the bag so it is updated - should not be recreated
+ 			s[index] = sessions.OpenSession();
+ 			t[index] = s[index].BeginTransaction();
+ 
+ 			bc[index] = (BasicClass)s[index].Load(typeof(BasicClass), id);
+ 			AssertPropertiesEqual(bc[index-1], bc[index]);
+ 			
+ 			// remove the last one and update another
+ 			bc[index].StringBag.RemoveAt(bc[index].StringBag.Count-1);
+ 			bc[index].StringBag[1] = "modified string 1";
+ 			s[index].Update(bc[index]);
+ 
+ 			t[index].Commit();
+ 			s[index].Close();
+ 
+ 			index++;
+ 
+ 			// add an item to the list
+ 			s[index] = sessions.OpenSession();
+ 			t[index] = s[index].BeginTransaction();
+ 
+ 			bc[index] = (BasicClass)s[index].Load(typeof(BasicClass), id);
+ 			AssertPropertiesEqual(bc[index-1], bc[index]);
+ 			
+ 			// remove the last one and update another
+ 			bc[index].StringBag.Add("inserted into the bag");
+ 			s[index].Update(bc[index]);
+ 
+ 			t[index].Commit();
+ 			s[index].Close();
+ 
+ 			index++;
+ 
+ 			// change the List to a new List so it is recreated
+ 			s[index] = sessions.OpenSession();
+ 			t[index] = s[index].BeginTransaction();
+ 
+ 			bc[index] = (BasicClass)s[index].Load(typeof(BasicClass), id);
+ 			AssertPropertiesEqual(bc[index-1], bc[index]);
+ 			
+ 			bc[index].StringBag = new ArrayList();
+ 			bc[index].StringBag.Add("new bag zero");
+ 			bc[index].StringBag.Add("new bag one");
+ 			s[index].Update(bc[index]);
+ 
+ 			t[index].Commit();
+ 			s[index].Close();
+ 
+ 			index++;
+ 			
+ 
+ 			// VERIFY PREVIOUS UPDATE & PERFORM DELETE 
+ 			s[index] = sessions.OpenSession();
+ 			t[index] = s[index].BeginTransaction();
+ 
+ 			bc[index] = (BasicClass)s[index].Load(typeof(BasicClass), id);
+ 			AssertPropertiesEqual(bc[index-1], bc[index]);
+ 			
+ 			// test the delete method
+ 			s[index].Delete(bc[index]);
+ 			
+ 			t[index].Commit();
+ 			s[index].Close();
+ 
+ 			index++;
+ 
+ 			// verify the delete went through
+ 			AssertDelete(id);
+ 		}
+ 
+ 		[Test]
  		public void TestListCRUD() 
  		{
***************
*** 794,802 ****
  			Assert.AreEqual(expected.TrueFalseProperty, actual.TrueFalseProperty, "TrueFalseProperty");
  			Assert.AreEqual(expected.YesNoProperty, actual.YesNoProperty, "YesNoProperty");
! 
  			if(includeCollections) 
  			{
  				ObjectAssertion.AssertEquals(expected.StringArray, actual.StringArray);
  				ObjectAssertion.AssertEquals(expected.Int32Array, actual.Int32Array);
  				ObjectAssertion.AssertEquals(expected.StringList, actual.StringList);
  				ObjectAssertion.AssertEquals(expected.StringMap, actual.StringMap, true);
--- 880,889 ----
  			Assert.AreEqual(expected.TrueFalseProperty, actual.TrueFalseProperty, "TrueFalseProperty");
  			Assert.AreEqual(expected.YesNoProperty, actual.YesNoProperty, "YesNoProperty");
! 			
  			if(includeCollections) 
  			{
  				ObjectAssertion.AssertEquals(expected.StringArray, actual.StringArray);
  				ObjectAssertion.AssertEquals(expected.Int32Array, actual.Int32Array);
+ 				ObjectAssertion.AssertEquals(expected.StringBag, actual.StringBag);
  				ObjectAssertion.AssertEquals(expected.StringList, actual.StringList);
  				ObjectAssertion.AssertEquals(expected.StringMap, actual.StringMap, true);
***************
*** 838,845 ****
  			basicClass.TrueFalseProperty = true;
  			basicClass.YesNoProperty = true;
! 
  			basicClass.StringArray = new string[] {"3 string", "2 string", "1 string"};
  			basicClass.Int32Array = new int[] {5,4,3,2,1};
  
  			IList stringList = new ArrayList(5);
  			stringList.Add("new string zero");
--- 925,939 ----
  			basicClass.TrueFalseProperty = true;
  			basicClass.YesNoProperty = true;
! 			
  			basicClass.StringArray = new string[] {"3 string", "2 string", "1 string"};
  			basicClass.Int32Array = new int[] {5,4,3,2,1};
  
+ 			IList stringBag = new ArrayList(3);
+ 			stringBag.Add("string 0");
+ 			stringBag.Add("string 1");
+ 			stringBag.Add("string 2");
+ 
+ 			basicClass.StringBag = stringBag;
+ 
  			IList stringList = new ArrayList(5);
  			stringList.Add("new string zero");

[Nhibernate-commit] nhibernate/src/NHibernate.Test/TypesTest BaseTypeFixture.cs,1.1,1.2

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

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/TypesTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28820/TypesTest

Modified Files:
	BaseTypeFixture.cs 
Log Message:
Added Guid column to the MockReader.

Index: BaseTypeFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/TypesTest/BaseTypeFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BaseTypeFixture.cs	22 Mar 2004 04:34:47 -0000	1.1
--- BaseTypeFixture.cs	14 Apr 2004 18:09:18 -0000	1.2
***************
*** 19,23 ****
  		protected const int Int32TypeColumnIndex = 2;
  		protected const int DecimalTypeColumnIndex = 3;
! 
  		[SetUp]
  		public void SetUp() 
--- 19,23 ----
  		protected const int Int32TypeColumnIndex = 2;
  		protected const int DecimalTypeColumnIndex = 3;
! 		protected const int GuidTypeColumnIndex = 4;
  		[SetUp]
  		public void SetUp() 
***************
*** 30,44 ****
  			dataTable.Columns.Add(new DataColumn("Int32Type", typeof(int)));
  			dataTable.Columns.Add(new DataColumn("DecimalType", typeof(decimal)));
  			mockReader.SetSchemaTable(dataTable);
  
! 			object[,] rowValues = new object[2,4];
  			rowValues[0,BooleanTypeColumnIndex] = true;
  			rowValues[0,ByteTypeColumnIndex] = 5;
  			rowValues[0,Int32TypeColumnIndex] = 0;
  			rowValues[0,DecimalTypeColumnIndex] = 5.64351M;
  			rowValues[1,BooleanTypeColumnIndex] = false;
  			rowValues[1,ByteTypeColumnIndex] = 6;
  			rowValues[1,Int32TypeColumnIndex] = 1;
  			rowValues[1,DecimalTypeColumnIndex] = 5.6435101M;
  			
  			mockReader.SetRows(rowValues);
--- 30,48 ----
  			dataTable.Columns.Add(new DataColumn("Int32Type", typeof(int)));
  			dataTable.Columns.Add(new DataColumn("DecimalType", typeof(decimal)));
+ 			dataTable.Columns.Add(new DataColumn("GuidType", typeof(Guid)));
  			mockReader.SetSchemaTable(dataTable);
  
! 			object[,] rowValues = new object[2,5];
  			rowValues[0,BooleanTypeColumnIndex] = true;
  			rowValues[0,ByteTypeColumnIndex] = 5;
  			rowValues[0,Int32TypeColumnIndex] = 0;
  			rowValues[0,DecimalTypeColumnIndex] = 5.64351M;
+ 			rowValues[0,GuidTypeColumnIndex] = new Guid("{01234567-abcd-abcd-abcd-0123456789ab}");
+ 
  			rowValues[1,BooleanTypeColumnIndex] = false;
  			rowValues[1,ByteTypeColumnIndex] = 6;
  			rowValues[1,Int32TypeColumnIndex] = 1;
  			rowValues[1,DecimalTypeColumnIndex] = 5.6435101M;
+ 			rowValues[1,GuidTypeColumnIndex] = new Guid("{76543210-dcba-dcba-dcba-ba9876543210}");
  			
  			mockReader.SetRows(rowValues);