Fix whitespace issues with filters (#388)

sebastienros · May 18, 2021 · 738a796 · 738a796
1 parent d9a2871
commit 738a796
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/YesSql.Filters.Abstractions/Nodes/OperatorNodes.cs b/src/YesSql.Filters.Abstractions/Nodes/OperatorNodes.cs
@@ -71,7 +71,7 @@ public override string ToNormalizedString()
             => $"({Left.ToNormalizedString()} OR {Right.ToNormalizedString()})";
 
         public override string ToString()
-            => $"{Left.ToString()} {Value} {Right.ToString()}";
+            => String.IsNullOrWhiteSpace(Value) ? $"{Left.ToString()} {Right.ToString()}" : $"{Left.ToString()} {Value} {Right.ToString()}";
     }
 
     public class AndNode : OperatorNode

diff --git a/test/YesSql.Tests/Filters/QueryEngineTests.cs b/test/YesSql.Tests/Filters/QueryEngineTests.cs
@@ -236,6 +236,19 @@ public void ShouldGroup(string search, string normalized)
             Assert.Equal(normalized, result.ToNormalizedString());
         }
 
+        [Theory]
+        [InlineData("title:bill steve")]
+        public void ShouldNotIncludeExtraWhitespace(string search)
+        {
+            var parser = new QueryEngineBuilder<Article>()
+                .WithNamedTerm("title", b => b.ManyCondition(ArticleManyMatch(), ArticleManyNotMatch()))
+                .Build();
+
+            var result = parser.Parse(search);
+
+            Assert.Equal(search, result.ToString());
+        }        
+
         [Fact]
         public void ShouldIgnoreMultipleNamedTerms()
         {