nhibernate-commit

[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("]]","]");
  		}