[Nhibernate-commit] SF.net SVN: nhibernate:[4787] branches/2.1.x/nhibernate/src/NHibernate

[<fab...@us...>]

Revision: 4787
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4787&view=rev
Author:   fabiomaulo
Date:     2009-10-18 19:16:19 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
Fixed NH-1858 with 'Not supported exception.'

Modified Paths:
--------------
    branches/2.1.x/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs
    branches/2.1.x/nhibernate/src/NHibernate.Test/DialectTest/MsSql2005DialectFixture.cs

Modified: branches/2.1.x/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs	2009-10-18 18:34:12 UTC (rev 4786)
+++ branches/2.1.x/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs	2009-10-18 19:16:19 UTC (rev 4787)
@@ -352,7 +352,7 @@
 			{
 				return 6;
 			}
-			return 0;
+			throw new NotSupportedException("The query should start with 'SELECT' or 'SELECT DISTINCT'");
 		}
 
 		private bool NeedsLockHint(LockMode lockMode)

Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/DialectTest/MsSql2005DialectFixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/DialectTest/MsSql2005DialectFixture.cs	2009-10-18 18:34:12 UTC (rev 4786)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/DialectTest/MsSql2005DialectFixture.cs	2009-10-18 19:16:19 UTC (rev 4787)
@@ -1,3 +1,4 @@
+using System;
 using NHibernate.Dialect;
 using NHibernate.Mapping;
 using NHibernate.SqlCommand;
@@ -184,5 +185,12 @@
             System.Console.WriteLine(ifExistsDropConstraint);
             Assert.AreEqual(expected, ifExistsDropConstraint);
 	    }
+
+			[Test]
+			public void GetLimitStringWithSqlComments()
+			{
+				var d = new MsSql2005Dialect();
+				Assert.Throws<NotSupportedException>(()=> d.GetLimitString(new SqlString(" /* criteria query */ SELECT p from lcdtm"), 0, 2));
+			}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.