From: Peter S. <sz...@us...> - 2004-04-15 09:30:24
|
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) |