Fix JasperFxGH-1374 (JasperFx#1383)

* Fix JasperFxGH-1374 - Fix JasperFxGH-1374 - Add unit tests * Fix related failing unit test
barryhagan · Nov 10, 2019 · 6235a66 · 6235a66
1 parent f81e4c1
commit 6235a66
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 2 deletions.
diff --git a/src/Marten.Testing/Bugs/Bug_337_certain_boolean_searches_are_not_using_searchable_field.cs b/src/Marten.Testing/Bugs/Bug_337_certain_boolean_searches_are_not_using_searchable_field.cs
@@ -21,7 +21,7 @@ public void use_searchable_fields_in_generated_sql()
                 var cmd2 = session.Query<Target>().Where(x => !x.Flag).ToCommand();
 
                 cmd1.CommandText.ShouldBe("select d.data, d.id, d.mt_version from public.mt_doc_target as d where d.flag = :arg0");
-                cmd2.CommandText.ShouldBe("select d.data, d.id, d.mt_version from public.mt_doc_target as d where d.flag != :arg0");
+                cmd2.CommandText.ShouldBe("select d.data, d.id, d.mt_version from public.mt_doc_target as d where (d.flag IS NULL or d.flag != :arg0)");
             }
         }
 

diff --git a/src/Marten.Testing/Linq/BoolNotVisitorTests.cs b/src/Marten.Testing/Linq/BoolNotVisitorTests.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Linq;
+using Marten.Services;
+using Xunit;
+
+namespace Marten.Testing.Linq
+{
+    public class BoolNotVisitorTests : DocumentSessionFixture<NulloIdentityMap>
+    {
+        private class TestClass
+        {
+            public TestClass()
+            {
+                Id = Guid.NewGuid();
+            }
+
+            public Guid Id { get; set; }
+            public bool Flag { get; set; }
+        }
+
+        [Fact]
+        public void when_doc_with_bool_false_should_return_records()
+        {
+            var docWithFlagFalse = new TestClass();
+
+            theSession.Store(docWithFlagFalse);
+            theSession.SaveChanges();
+
+            using (var s = theStore.OpenSession())
+            {
+                var items = s.Query<TestClass>().Where(x => !x.Flag).ToList();
+
+                Assert.Single(items);
+                Assert.Equal(docWithFlagFalse.Id, items[0].Id);
+            }
+        }
+
+        [Fact]
+        public void when_doc_with_bool_false_with_serializer_default_value_handling_null_should_return_records()
+        {
+            var serializer = new JsonNetSerializer();
+            serializer.Customize(s =>
+            {
+                s.DefaultValueHandling = Newtonsoft.Json.DefaultValueHandling.Ignore;
+            });
+
+            StoreOptions(x => x.Serializer(serializer));
+
+            // Note: with serializer settings DefaultValueHandling.Ignore, serialized JSON won't have Flag property
+            var docWithFlagFalse = new TestClass();
+
+            theSession.Store(docWithFlagFalse);
+            theSession.SaveChanges();
+
+            using (var s = theStore.OpenSession())
+            {
+                var items = s.Query<TestClass>().Where(x => !x.Flag).ToList();
+
+                Assert.Single(items);
+                Assert.Equal(docWithFlagFalse.Id, items[0].Id);
+            }
+        }
+    }
+}
diff --git a/src/Marten/Linq/NotVisitor.cs b/src/Marten/Linq/NotVisitor.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using Baseline;
@@ -58,7 +59,12 @@ protected override Expression VisitMember(MemberExpression expression)
             if (expression.Type == typeof(bool))
             {
                 var locator = _mapping.JsonLocator(expression);
-                var @where = new WhereFragment($"{locator} != ?", true);
+                var whereFragments = new List<IWhereFragment>
+                {
+                    new WhereFragment($"{locator} IS NULL"),
+                    new WhereFragment($"{locator} != ?", true)
+                };
+                var @where = new CompoundWhereFragment("or", whereFragments.ToArray());
                 _callback(@where);
             }