Fixed problem caused by order-by attribute with multicolumns generating

incorrect sql.


SVN: trunk@1035

Author: Mike Doerfler

src/NHibernate.Test/SqlCommandTest/TemplateFixture.cs

@@ -32,5 +32,27 @@ public void ReplaceWithDialectQuote()
 
 		}
 
+		[Test]
+		public void OrderBySingleColumn() 
+		{
+			Dialect.Dialect dialect = new Dialect.MsSql2000Dialect();
+
+			string orderBy = "col1 asc";
+			string expectedOrderBy = "$PlaceHolder.col1 asc";
+
+			Assert.AreEqual( expectedOrderBy, Template.RenderOrderByStringTemplate( orderBy, dialect ) );
+		}
+
+		[Test]
+		public void OrderByMultiColumn() 
+		{
+			Dialect.Dialect dialect = new Dialect.MsSql2000Dialect();
+
+			string orderBy = "col1 asc, col2 desc, col3";
+			string expectedOrderBy = "$PlaceHolder.col1 asc, $PlaceHolder.col2 desc, $PlaceHolder.col3";
+
+			Assert.AreEqual( expectedOrderBy, Template.RenderOrderByStringTemplate( orderBy, dialect ) );
+		}
+
 	}
 }

src/NHibernate/SqlCommand/Template.cs

@@ -167,7 +167,7 @@ public static string RenderWhereStringTemplate(string sqlWhereString, Dialect.Di
 		public static string RenderOrderByStringTemplate(string sqlOrderByString, Dialect.Dialect dialect) 
 		{
 			//TODO: make this a bit nicer
-			StringTokenizer tokens = new StringTokenizer(sqlOrderByString, ",");
+			StringTokenizer tokens = new StringTokenizer(sqlOrderByString, ",", false);
 			StringBuilder result = new StringBuilder(sqlOrderByString.Length + 2);
 			bool commaNeeded = false; 
 			IEnumerator tokenEnum = tokens.GetEnumerator();