Merge remote branches 'firo222/master' and 'briandonahue/master'

Author: jagregory

src/FluentNHibernate.Testing/DomainModel/Mapping/ClassMapXmlCreationTester.cs

@@ -582,6 +582,7 @@ public class ChildObject
         public virtual int Id { get; set; }
         public virtual string Name { get; set; }
         public virtual int Position { get; set; }
+        public virtual bool Active { get; set; }
     }
 
     public class MappedGenericObject<T>

src/FluentNHibernate.Testing/ExpressionToSqlTests.cs

@@ -55,6 +55,38 @@ public void ConvertEqualsPropertyAndString()
             sql.ShouldEqual("Name = '1'");
         }
 
+        [Test]
+        public void ConvertEqualsPropertyAndTrue()
+        {
+            var sql = ExpressionToSql.Convert<ChildObject>(x => x.Active == true);
+
+            sql.ShouldEqual("Active = 1");
+        }
+
+        [Test]
+        public void ConvertEqualsPropertyAndFalse()
+        {
+            var sql = ExpressionToSql.Convert<ChildObject>(x => x.Active == false);
+
+            sql.ShouldEqual("Active = 0");
+        }
+
+        [Test]
+        public void ConvertBooleanPropertyImplicitTrue()
+        {
+            var sql = ExpressionToSql.Convert<ChildObject>(x => x.Active);
+
+            sql.ShouldEqual("Active = 1");
+        }
+
+        [Test]
+        public void ConvertBooleanPropertyImplicitFalse()
+        {
+            var sql = ExpressionToSql.Convert<ChildObject>(x => !x.Active);
+
+            sql.ShouldEqual("Active = 0");
+        }
+
         [Test]
         public void ConvertGreater()
         {

src/FluentNHibernate/Mapping/VersionPart.cs

@@ -12,7 +12,7 @@ public class VersionPart : IVersionMappingProvider
         private readonly Type entity;
         private readonly Member property;
         private readonly AccessStrategyBuilder<VersionPart> access;
-        private readonly VersionGeneratedBuilder<IVersionMappingProvider> generated;
+        private readonly VersionGeneratedBuilder<VersionPart> generated;
         private readonly AttributeStore<VersionMapping> attributes = new AttributeStore<VersionMapping>();
         private readonly AttributeStore<ColumnMapping> columnAttributes = new AttributeStore<ColumnMapping>();
         private readonly List<string> columns = new List<string>();
@@ -23,13 +23,13 @@ public VersionPart(Type entity, Member property)
             this.entity = entity;
             this.property = property;
             access = new AccessStrategyBuilder<VersionPart>(this, value => attributes.Set(x => x.Access, value));
-            generated = new VersionGeneratedBuilder<IVersionMappingProvider>(this, value => attributes.Set(x => x.Generated, value));
+            generated = new VersionGeneratedBuilder<VersionPart>(this, value => attributes.Set(x => x.Generated, value));
         }
 
         /// <summary>
         /// Specify if this version is database generated
         /// </summary>
-        public VersionGeneratedBuilder<IVersionMappingProvider> Generated
+        public VersionGeneratedBuilder<VersionPart> Generated
         {
             get { return generated; }
         }

src/FluentNHibernate/Utils/ExpressionToSql.cs

@@ -32,6 +32,14 @@ public static string Convert<T>(Expression<Func<T, bool>> expression)
         {
             if (expression.Body is BinaryExpression)
                 return Convert<T>((BinaryExpression)expression.Body);
+            var memberExpression = expression.Body as MemberExpression;
+            if (memberExpression != null && memberExpression.Type == typeof(bool))
+                    return Convert(CreateExpression<T>(memberExpression)) + " = " + Convert(true);
+            var unaryExpression = expression.Body as UnaryExpression;
+            if (unaryExpression != null && unaryExpression.Type == typeof(bool) && unaryExpression.NodeType == ExpressionType.Not)
+                    return Convert(CreateExpression<T>(unaryExpression.Operand)) + " = " + Convert(false);
+                
+
 
             throw new NotImplementedException();
         }
@@ -135,6 +143,10 @@ private static string Convert(object value)
         {
             if (value is string)
                 return "'" + value + "'";
+            if (value is bool)
+            {
+                return (bool)value ? "1" : "0";
+            }
 
             return value.ToString();
         }