Merge pull request #424 from hazzik/NH-2839

NH-2839 - Fix cast issue when Boolean is implemented by IEnhancedUserType

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH2839/FixtureByCode.cs

@@ -0,0 +1,157 @@
+using System;
+using System.Data;
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Linq;
+using NHibernate.Mapping.ByCode;
+using NHibernate.SqlTypes;
+using NHibernate.UserTypes;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH2839
+{
+	class Entity
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual bool IsActive { get; set; }
+	}
+
+	public class MyBooleanType : IEnhancedUserType
+	{
+		public SqlType[] SqlTypes
+		{
+			get { return new[] {SqlTypeFactory.Int32}; }
+		}
+
+		public System.Type ReturnedType
+		{
+			get { return typeof (bool); }
+		}
+
+		public bool Equals(object x, object y)
+		{
+			if (x == y) return true;
+
+			if (x is bool && y is bool)
+				return (bool) x == (bool) y;
+			return false;
+		}
+
+		public int GetHashCode(object x)
+		{
+			return x.GetHashCode();
+		}
+
+		public object NullSafeGet(IDataReader rs, string[] names, object owner)
+		{
+			var ordinal = rs.GetOrdinal(names[0]);
+			if (rs.IsDBNull(ordinal))
+				return false;
+			return rs.GetInt32(ordinal) == 1;
+		}
+
+		public void NullSafeSet(IDbCommand cmd, object value, int index)
+		{
+			((IDbDataParameter) cmd.Parameters[index]).Value = ((bool) value) ? 1 : -1;
+		}
+
+		public object DeepCopy(object value)
+		{
+			return (bool)value;
+		}
+
+		public bool IsMutable
+		{
+			get { return false; }
+		}
+
+		public object Replace(object original, object target, object owner)
+		{
+			return original;
+		}
+
+		public object Assemble(object cached, object owner)
+		{
+			return cached;
+		}
+
+		public object Disassemble(object value)
+		{
+			return value;
+		}
+
+		public object FromXMLString(string xml)
+		{
+			return xml;
+		}
+
+		public string ObjectToSQLString(object value)
+		{
+			return ((bool) value) ? "1" : "-1";
+		}
+
+		public string ToXMLString(object value)
+		{
+			return ((bool)value) ? "1" : "-1";
+		}
+	}
+
+	public class FixtureByCode : TestCaseMappingByCode
+	{
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<Entity>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+				rc.Property(x => x.IsActive, pm=>pm.Type<MyBooleanType>());
+			});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		protected override void OnSetUp()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				var e1 = new Entity { Name = "Bob", IsActive = true};
+				session.Save(e1);
+
+				var e2 = new Entity { Name = "Sally",IsActive = false};
+				session.Save(e2);
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void YourTestName()
+		{
+			using (ISession session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var result = from e in session.Query<Entity>()
+							 where e.IsActive
+							 select e;
+
+				Assert.AreEqual(1, result.ToList().Count);
+			}
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -717,6 +717,7 @@
     <Compile Include="NHSpecificTest\BagWithLazyExtraAndFilter\Fixture.cs" />
     <Compile Include="Linq\ByMethod\DistinctTests.cs" />
     <Compile Include="Component\Basic\ComponentWithUniqueConstraintTests.cs" />
+    <Compile Include="NHSpecificTest\NH2839\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH3564\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH3583\Entity.cs" />
     <Compile Include="NHSpecificTest\NH3583\AutoFlushFixture.cs" />

src/NHibernate/Hql/Ast/ANTLR/Tree/BooleanLiteralNode.cs

@@ -12,49 +12,32 @@ namespace NHibernate.Hql.Ast.ANTLR.Tree
 	[CLSCompliant(false)]
 	public class BooleanLiteralNode : LiteralNode, IExpectedTypeAwareNode 
 	{
-		private IType _expectedType;
-
 		public BooleanLiteralNode(IToken token) : base(token)
 		{
 		}
 
 		public override IType DataType
 		{
-			get
-			{
-				return _expectedType ?? NHibernateUtil.Boolean;
-			}
-			set
-			{
-				base.DataType = value;
-			}
+			get { return ExpectedType ?? NHibernateUtil.Boolean; }
+			set { base.DataType = value; }
 		}
 
-		private BooleanType GetTypeInternal() 
+		private ILiteralType TypeAsLiteralType()
 		{
-			return ( BooleanType ) DataType;
+			return (ILiteralType) DataType;
 		}
 
 		private bool GetValue() {
-			return Type == HqlSqlWalker.TRUE ? true : false;
+			return Type == HqlSqlWalker.TRUE;
 		}
 
-		/**
-		 * Expected-types really only pertinent here for boolean literals...
-		 *
-		 * @param expectedType
-		 */
-		public IType ExpectedType
-		{
-			get { return _expectedType; }
-			set { _expectedType = value; }
-		}
+		public IType ExpectedType { get; set; }
 
 		public override SqlString RenderText(ISessionFactoryImplementor sessionFactory) 
 		{
 			try
 			{
-				return new SqlString(GetTypeInternal().ObjectToSQLString( GetValue(), sessionFactory.Dialect ));
+				return new SqlString(TypeAsLiteralType().ObjectToSQLString( GetValue(), sessionFactory.Dialect ));
 			}
 			catch( Exception t )
 			{