NH-3225 - Support for Boolean bitwise operators

Author: hazzik

src/NHibernate.Test/Linq/WhereTests.cs

@@ -204,6 +204,28 @@ public void UsersRegisteredAtOrBeforeY2KOrNamedNHibernate()
 			Assert.That(query.Count, Is.EqualTo(2));
 		}
 
+		[Test]
+		public void UsersRegisteredAtOrBeforeY2KAndBitwiseNamedNHibernate()
+		{
+			//NH-3225
+			var query = (from user in db.Users
+						 where user.RegisteredAt <= new DateTime(2000, 1, 1) & user.Name == "nhibernate"
+						 select user).ToList();
+
+			Assert.That(query.Count, Is.EqualTo(1));
+		}
+
+		[Test]
+		public void UsersRegisteredAtOrBeforeY2KOrBitwiseNamedNHibernate()
+		{
+			//NH-3225
+			var query = (from user in db.Users
+						 where user.RegisteredAt <= new DateTime(2000, 1, 1) | user.Name == "nhibernate"
+						 select user).ToList();
+
+			Assert.That(query.Count, Is.EqualTo(2));
+		}
+
 		[Test]
 		public void TestDataContext()
 		{

src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs

@@ -224,10 +224,25 @@ protected HqlTreeNode VisitBinaryExpression(BinaryExpression expression)
 			switch (expression.NodeType)
 			{
 				case ExpressionType.And:
+					if (expression.Type == typeof(bool))
+					{
+						return
+							_hqlTreeBuilder.Cast(
+								_hqlTreeBuilder.MethodCall("band", lhs.ToArithmeticExpression(), rhs.ToArithmeticExpression()),
+								typeof(bool));
+
+					}
 					return _hqlTreeBuilder.BitwiseAnd(lhs, rhs);
 				case ExpressionType.AndAlso:
 					return _hqlTreeBuilder.BooleanAnd(lhs.ToBooleanExpression(), rhs.ToBooleanExpression());
 				case ExpressionType.Or:
+					if (expression.Type == typeof(bool))
+					{
+						return
+							_hqlTreeBuilder.Cast(
+								_hqlTreeBuilder.MethodCall("bor", lhs.ToArithmeticExpression(), rhs.ToArithmeticExpression()),
+								typeof(bool));
+					}
 					return _hqlTreeBuilder.BitwiseOr(lhs, rhs);
 				case ExpressionType.OrElse:
 					return _hqlTreeBuilder.BooleanOr(lhs.ToBooleanExpression(), rhs.ToBooleanExpression());