Thread: [Nhibernate-commit] SF.net SVN: nhibernate:[4147] trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4147
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4147&view=rev
Author:   fabiomaulo
Date:     2009-03-18 16:34:39 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
Fix NH-1694

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Added Paths:
-----------
    trunk/NHibernate.Test/
    trunk/NHibernate.Test/NHSpecificTest/
    trunk/NHibernate.Test/NHSpecificTest/NH1694/
    trunk/NHibernate.Test/NHSpecificTest/NH1694/Mappings.hbm.xml
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Fixture.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Mappings.hbm.xml

Added: trunk/NHibernate.Test/NHSpecificTest/NH1694/Mappings.hbm.xml
===================================================================

--- trunk/NHibernate.Test/NHSpecificTest/NH1694/Mappings.hbm.xml	                        (rev 0)
+++ trunk/NHibernate.Test/NHSpecificTest/NH1694/Mappings.hbm.xml	2009-03-18 16:34:39 UTC (rev 4147)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH1694">
+
+  <class name="User" table="Users">
+      <id name="Id">
+          <generator class="native"/>
+      </id>
+    <property name="OrderStatus" formula="CASE ISNULL((SELECT MIN(CONVERT(INT,ISNULL(o.Status,0))) FROM dbo.Orders o WHERE o.userid=id),-1) WHEN -1 THEN 0 WHEN 0 THEN 1 ELSE 2 END" />
+  </class>
+
+  <class name="Orders">
+    <id name="Id">
+      <generator class="native"/>
+    </id>
+    <property name="Status" />
+    <many-to-one name="User" class="User" column="UserID" />
+  </class>
+  
+</hibernate-mapping>

Modified: trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs	2009-03-18 15:54:41 UTC (rev 4146)
+++ trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs	2009-03-18 16:34:39 UTC (rev 4147)
@@ -56,16 +56,9 @@
 			RegisterColumnType(DbType.Currency, "MONEY");
 			RegisterColumnType(DbType.Date, "DATETIME");
 			RegisterColumnType(DbType.DateTime, "DATETIME");
-			// TODO: figure out if this is the good way to fix the problem
-			// with exporting a DECIMAL column
-			// NUMERIC(precision, scale) has a hardcoded precision of 19, even though it can range from 1 to 38
-			// and the scale has to be 0 <= scale <= precision.
-			// I think how I might handle it is keep the type="Decimal(29,5)" and make them specify a 
-			// sql-type="decimal(20,5)" if they need to do that.  The Decimal parameter and ddl will get generated
-			// correctly with minimal work.
 			RegisterColumnType(DbType.Decimal, "DECIMAL(19,5)");
 			RegisterColumnType(DbType.Decimal, 19, "DECIMAL(19, $l)");
-            RegisterColumnType(DbType.Decimal, 19, "DECIMAL($p, $s)");
+			RegisterColumnType(DbType.Decimal, 19, "DECIMAL($p, $s)");
 			RegisterColumnType(DbType.Double, "DOUBLE PRECISION"); //synonym for FLOAT(53)
 			RegisterColumnType(DbType.Guid, "UNIQUEIDENTIFIER");
 			RegisterColumnType(DbType.Int16, "SMALLINT");
@@ -136,6 +129,7 @@
 			RegisterFunction("iif", new SQLFunctionTemplate(null, "case when ?1 then ?2 else ?3 end"));
 
 			RegisterKeyword("top");
+			RegisterKeyword("integer");
 
 			DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SqlClientDriver";
 			DefaultProperties[Environment.PrepareSql] = "true";

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Fixture.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Fixture.cs	2009-03-18 16:34:39 UTC (rev 4147)
@@ -0,0 +1,95 @@
+using System.Collections.Generic;
+using NHibernate.Criterion;
+using NHibernate.Dialect;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+
+namespace NHibernate.Test.NHSpecificTest.NH1694
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override bool AppliesTo(Dialect.Dialect dialect)
+		{
+			return dialect is MsSql2005Dialect;
+		}
+
+		private void FillDb()
+		{
+			base.OnSetUp();
+			using (ISession session = OpenSession())
+			{
+				using (ITransaction tran = session.BeginTransaction())
+				{
+					var newUser = new User();
+					var newOrder1 = new Orders {User = newUser, Status = true};
+					var newOrder2 = new Orders {User = newUser, Status = true};
+
+					session.Save(newUser);
+					session.Save(newOrder1);
+					session.Save(newOrder2);
+
+					newUser = new User();
+					newOrder1 = new Orders {User = newUser, Status = false};
+
+					session.Save(newUser);
+					session.Save(newOrder1);
+
+					tran.Commit();
+				}
+			}
+		}
+
+		private void Cleanup()
+		{
+			base.OnTearDown();
+			using (ISession session = OpenSession())
+			{
+				using (ITransaction tran = session.BeginTransaction())
+				{
+					session.Delete("from Orders");
+					session.Delete("from User");
+					tran.Commit();
+				}
+			}
+		}
+
+		[Test]
+		public void CanOrderByExpressionContainingACommaInAPagedQuery()
+		{
+			FillDb();
+			using (ISession session = OpenSession())
+			{
+				using (ITransaction tran = session.BeginTransaction())
+				{
+					ICriteria crit = session.CreateCriteria(typeof (User));
+					crit.AddOrder(Order.Desc("OrderStatus"));
+					crit.AddOrder(Order.Asc("Id"));
+					crit.SetMaxResults(10);
+
+					IList<User> list = crit.List<User>();
+
+					Assert.That(list.Count, Is.EqualTo(2));
+					Assert.That(list[0].OrderStatus, Is.EqualTo(2));
+					Assert.That(list[1].OrderStatus, Is.EqualTo(1));
+
+					tran.Commit();
+				}
+			}
+			Cleanup();
+		}
+	}
+
+	public class User
+	{
+		public virtual int Id { get; set; }
+		public virtual int OrderStatus { get; set; }
+	}
+
+	public class Orders
+	{
+		public virtual int Id { get; set; }
+		public virtual bool Status { get; set; }
+		public virtual User User { get; set; }
+	}
+}
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Mappings.hbm.xml	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1694/Mappings.hbm.xml	2009-03-18 16:34:39 UTC (rev 4147)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH1694">
+
+  <class name="User" table="Users">
+      <id name="Id">
+          <generator class="native"/>
+      </id>
+    <property name="OrderStatus" 
+			  formula="CASE ISNULL((SELECT MIN(CONVERT(INTEGER,ISNULL(o.Status,0))) FROM dbo.Orders o WHERE o.userid=id),-1) WHEN -1 THEN 0 WHEN 0 THEN 1 ELSE 2 END" />
+  </class>
+
+  <class name="Orders">
+    <id name="Id">
+      <generator class="native"/>
+    </id>
+    <property name="Status" />
+    <many-to-one name="User" class="User" column="UserID" />
+  </class>
+  
+</hibernate-mapping>

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2009-03-18 15:54:41 UTC (rev 4146)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2009-03-18 16:34:39 UTC (rev 4147)
@@ -292,6 +292,7 @@
     <Compile Include="GenericTest\SetGeneric\SetGenericFixture.cs" />
     <Compile Include="HQL\Animal.cs" />
     <Compile Include="HQL\BaseFunctionFixture.cs" />
+    <Compile Include="NHSpecificTest\NH1694\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1706\Domain.cs" />
     <Compile Include="NHSpecificTest\NH1706\KeyPropertyRefFixture.cs" />
     <Compile Include="NHSpecificTest\NH645\HQLFunctionFixture.cs" />
@@ -1684,6 +1685,7 @@
     <EmbeddedResource Include="Cascade\JobBatch.hbm.xml" />
     <EmbeddedResource Include="Deletetransient\Person.hbm.xml" />
     <Content Include="DynamicEntity\package.html" />
+    <EmbeddedResource Include="NHSpecificTest\NH1694\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1706\Mappings.hbm.xml" />
     <EmbeddedResource Include="Stateless\Naturalness.hbm.xml" />
     <EmbeddedResource Include="TransformTests\Simple.hbm.xml" />


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




Thread: [Nhibernate-commit] SF.net SVN: nhibernate:[4147] trunk

nhibernate-commit