[Nhibernate-commit] SF.net SVN: nhibernate:[4035] trunk/nhibernate/src/NHibernate

[<dar...@us...>]

Revision: 4035
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4035&view=rev
Author:   darioquintana
Date:     2009-02-04 13:53:38 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
Fix NH-1654 by Remco Ros

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs
    trunk/nhibernate/src/NHibernate/SqlCommand/Template.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1654/Fixture.cs

Modified: trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs	2009-02-04 12:59:40 UTC (rev 4034)
+++ trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs	2009-02-04 13:53:38 UTC (rev 4035)
@@ -16,6 +16,7 @@
 			RegisterColumnType(DbType.String, 1073741823, "NVARCHAR(MAX)");
 			RegisterColumnType(DbType.AnsiString, 2147483647, "VARCHAR(MAX)");
 			RegisterColumnType(DbType.Binary, 2147483647, "VARBINARY(MAX)");
+			RegisterKeyword("top");
 		}
 
 		/// <summary>

Modified: trunk/nhibernate/src/NHibernate/SqlCommand/Template.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/SqlCommand/Template.cs	2009-02-04 12:59:40 UTC (rev 4034)
+++ trunk/nhibernate/src/NHibernate/SqlCommand/Template.cs	2009-02-04 13:53:38 UTC (rev 4035)
@@ -311,7 +311,7 @@
 			return "(".Equals(nextToken) ||
 			       Keywords.Contains(lcToken) ||
 			       functionRegistry.HasFunction(lcToken) ||
-			       // TODO H3: dialect.Keywords.Contains(lcToken) ||
+			       dialect.Keywords.Contains(lcToken) ||
 			       FunctionKeywords.Contains(lcToken);
 		}
 

Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1654/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1654/Fixture.cs	2009-02-04 12:59:40 UTC (rev 4034)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1654/Fixture.cs	2009-02-04 13:53:38 UTC (rev 4035)
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using NHibernate.Dialect;
+using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH1654
 {
@@ -10,7 +11,12 @@
 			get { return "NH1654"; }
 		}
 
-		[Test,Ignore]
+		protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
+		{
+			return dialect is MsSql2000Dialect;
+		}
+
+		[Test]
 		public void Test()
 		{
 			int employeeId;


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