Fixing NH 2044 & NH 2045

SVN: trunk@4910

Author: ayende

src/NHibernate.Test/NHSpecificTest/NH2044/DomainClass.cs

@@ -0,0 +1,22 @@
+
+
+namespace NHibernate.Test.NHSpecificTest.NH2044
+{
+    public class DomainClass
+    {
+        private char symbol;
+        private int id;
+
+        public int Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+
+        public char Symbol
+        {
+            get { return symbol; }
+            set { symbol = value; }
+        }
+    }
+}

src/NHibernate.Test/NHSpecificTest/NH2044/Mappings.hbm.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH2044" default-access="field.camelcase"
+                   default-lazy="false">
+  <class name="DomainClass">
+    <id name="Id">
+      <generator class="assigned" />
+    </id>
+    <property name="Symbol" type="Char"/>
+  </class>
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH2044/SampleTest.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using NHibernate.Dialect;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH2044
+{
+    [TestFixture]
+    public class SampleTest : BugTestCase
+    {
+        protected override void OnSetUp()
+        {
+            base.OnSetUp();
+            using (ISession session = this.OpenSession())
+            {
+                DomainClass entity = new DomainClass();
+                entity.Id = 1;
+                entity.Symbol = 'S';
+                session.Save(entity);
+                session.Flush();
+            }
+        }
+
+        protected override void OnTearDown()
+        {
+            base.OnTearDown();
+            using (ISession session = this.OpenSession())
+            {
+                string hql = "from DomainClass";
+                session.Delete(hql);
+                session.Flush();
+            }
+        }
+
+
+        [Test]
+        public void IgnoreCaseShouldWorkWithCharCorrectly()
+        {
+            using (ISession session = this.OpenSession())
+            {
+                ICriteria criteria = session.CreateCriteria(typeof(DomainClass), "domain");
+                criteria.Add(NHibernate.Criterion.Expression.Eq("Symbol", 's').IgnoreCase());
+                IList<DomainClass> list = criteria.List<DomainClass>();
+
+                Assert.AreEqual(1, list.Count);
+                
+            }
+        }
+    }
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -658,6 +658,8 @@
     <Compile Include="NHSpecificTest\NH1938\Model.cs" />
     <Compile Include="NHSpecificTest\NH1939\AuxType.cs" />
     <Compile Include="NHSpecificTest\NH1939\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH2044\DomainClass.cs" />
+    <Compile Include="NHSpecificTest\NH2044\SampleTest.cs" />
     <Compile Include="NHSpecificTest\NH2055\AuxType.cs" />
     <Compile Include="NHSpecificTest\NH2055\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2057\Fixture.cs" />
@@ -2098,6 +2100,7 @@
     <EmbeddedResource Include="CfgTest\Loquacious\EntityToCache.hbm.xml" />
     <EmbeddedResource Include="DriverTest\SqlServerCeEntity.hbm.xml" />
     <Content Include="DynamicEntity\package.html" />
+    <EmbeddedResource Include="NHSpecificTest\NH2044\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2030\Mappings.hbm.xml" />
     <EmbeddedResource Include="Linq\Mappings\Patient.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2055\Mappings.hbm.xml" />

src/NHibernate/Type/AbstractCharType.cs

@@ -48,7 +48,7 @@ public override System.Type ReturnedClass
 
 		public override void Set(IDbCommand cmd, object value, int index)
 		{
-			((IDataParameter)cmd.Parameters[index]).Value = (char)value;
+			((IDataParameter)cmd.Parameters[index]).Value = Convert.ToChar(value);
 		}
 
 		public override string ObjectToSQLString(object value, Dialect.Dialect dialect)