Insert MatchAllDocsQuery into OrElse BinaryExpressions.

Fixes incorrect query translation of e.g. (d.Name == "A" || d.Year != 2001).
chriseldredge · Jan 5, 2015 · fa04787 · fa04787
1 parent 5c1b9d7
commit fa04787
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 12 deletions.
diff --git a/source/Lucene.Net.Linq.Tests/Integration/SelectTests.cs b/source/Lucene.Net.Linq.Tests/Integration/SelectTests.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Lucene.Net.Analysis;
 using Lucene.Net.Linq.Analysis;
 using Lucene.Net.Linq.Mapping;
@@ -88,6 +89,18 @@ public void Where()
             Assert.That(result.Single().Name, Is.EqualTo("My Document"));
         }
 
+        [Test]
+        public void BinaryOrWithNegation()
+        {
+            AddDocument(new SampleDocument { Name = "Interstellar", Scalar = 2010});
+            AddDocument(new SampleDocument { Name = "Gladiator", Scalar = 2000 });
+
+            var documents = provider.AsQueryable<SampleDocument>();
+            var result = documents.Where(d => d.Scalar == 2010 || d.Name != "Interstellar").ToList();
+
+            Assert.That(result.Select(d => d.Name), Is.EquivalentTo(new[] {"Interstellar", "Gladiator"}));
+        }
+
         [Test]
         public void Where_FlagEqualTrue()
         {
@@ -260,7 +273,7 @@ public void Where_IgnoresToLowerWithinNullSafetyCondition()
 
             Assert.That(result.Single().Name, Is.EqualTo("My Document"));
         }
-        
+
         [Test]
         public void Where_Keyword_StartsWith()
         {
@@ -347,7 +360,7 @@ public void Where_StartsWith_Negate_NullSafe()
             AddDocument(new SampleDocument { Name = "My Document", NullableScalar = 12 });
 
             var documents = provider.AsQueryable<SampleDocument>();
-            
+
             var result = from doc in documents where (bool)(!((bool?)doc.Name.StartsWith("other"))) select doc;
 
             Assert.That(result.Single().Name, Is.EqualTo("My Document"));
@@ -515,5 +528,5 @@ public void Where_AnyField_StartsWith()
         }
 
     }
- 
+
 }
diff --git a/source/Lucene.Net.Linq/Translation/TreeVisitors/QueryBuildingExpressionTreeVisitor.cs b/source/Lucene.Net.Linq/Translation/TreeVisitors/QueryBuildingExpressionTreeVisitor.cs
@@ -84,7 +84,7 @@ protected override Expression VisitLuceneQueryPredicateExpression(LuceneQueryPre
             var pattern = GetPattern(expression, mapping);
 
             var occur = expression.Occur;
-            
+
             if (string.IsNullOrEmpty(pattern))
             {
                 pattern = "*";
@@ -121,7 +121,7 @@ protected override Expression VisitLuceneRangeQueryExpression(LuceneRangeQueryEx
             var mapping = fieldMappingInfoProvider.GetMappingInfo(expression.QueryField.FieldName);
 
             var query = CreateRangeQuery(mapping, expression.LowerQueryType, expression.Lower, expression.UpperQueryType, expression.Upper);
-            
+
             queries.Push(new BooleanQuery {{query, expression.Occur}});
 
             return base.VisitLuceneRangeQueryExpression(expression);
@@ -147,8 +147,8 @@ private string GetPattern(LuceneQueryPredicateExpression expression, IFieldMappi
             if (expression.Fuzzy.HasValue)
             {
                 pattern += string.Format(
-                    CultureInfo.InvariantCulture, 
-                    "~{0}", 
+                    CultureInfo.InvariantCulture,
+                    "~{0}",
                     expression.Fuzzy.Value);
             }
 
@@ -179,7 +179,7 @@ private static Occur Negate(Occur occur)
                        ? Occur.MUST
                        : Occur.MUST_NOT;
         }
-        
+
         private Expression MakeBooleanQuery(BinaryExpression expression)
         {
             var result = base.VisitBinaryExpression(expression);
@@ -201,7 +201,15 @@ private void Combine(BooleanQuery target, BooleanQuery source, Occur occur)
         {
             if (source.GetClauses().Length == 1)
             {
-                var clause = source.GetClauses()[0];
+                var clause = source.GetClauses().Single();
+                if (clause.IsProhibited && occur == Occur.SHOULD)
+                {
+                    source = (BooleanQuery)source.Clone();
+                    source.Add(new MatchAllDocsQuery(), Occur.SHOULD);
+                    target.Add(source, occur);
+                    return;
+                }
+
                 if (clause.Occur == Occur.MUST)
                 {
                     clause.Occur = occur;
@@ -228,7 +236,7 @@ private object EvaluateExpression(Expression expression)
         private string EvaluateExpressionToString(LuceneQueryPredicateExpression expression, IFieldMappingInfo mapping)
         {
             var result = EvaluateExpression(expression);
-            
+
             var str = mapping == null ? result.ToString() : mapping.ConvertToQueryExpression(result);
 
             if (expression.AllowSpecialCharacters)
@@ -237,4 +245,4 @@ private string EvaluateExpressionToString(LuceneQueryPredicateExpression express
             return mapping != null ? mapping.EscapeSpecialCharacters(str) : str;
         }
     }
-}
+}