Merge pull request #425 from mk3008/421-experiment-typesafe-query-bui…

…lder-unable-to-build-or-conditions-correctly Fixed an issue where OR conditions were not grouped correctly.
mk3008 · May 27, 2024 · 4dc7ffe · 4dc7ffe
2 parents 9181547 + 6c9875c
commit 4dc7ffe
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 12 deletions.
diff --git a/src/Carbunql.TypeSafe/Extensions/BinaryExpressionExtension.cs b/src/Carbunql.TypeSafe/Extensions/BinaryExpressionExtension.cs
@@ -1,4 +1,5 @@
 using Carbunql.Analysis.Parser;
+using Carbunql.Extensions;
 using System.Linq.Expressions;
 
 namespace Carbunql.TypeSafe.Extensions;
@@ -24,11 +25,12 @@ private static string ToValue(ExpressionType nodeType, string left, string right
         // Enclose expressions in parentheses based on operator precedence or specific conditions
         if (nodeType == ExpressionType.OrElse)
         {
-            if (leftValue.GetOperators().Any())
+            // If an AND condition exists, enclose the whole in parentheses.
+            if (leftValue.GetOperators().Where(x => x.IsEqualNoCase("and")).Any())
             {
                 left = $"({left})";
             }
-            if (rightValue.GetOperators().Any())
+            if (rightValue.GetOperators().Where(x => x.IsEqualNoCase("and")).Any())
             {
                 right = $"({right})";
             }
@@ -61,7 +63,7 @@ private static string ToValue(ExpressionType nodeType, string left, string right
             ExpressionType.LessThan => $"{left} < {right}",
             ExpressionType.LessThanOrEqual => $"{left} <= {right}",
             ExpressionType.AndAlso => $"{left} and {right}",
-            ExpressionType.OrElse => $"{left} or {right}",
+            ExpressionType.OrElse => $"({left} or {right})",
             _ => throw new NotSupportedException($"Unsupported expression type: {nodeType}")
         };
     }

diff --git a/src/Carbunql.TypeSafe/FluentSelectQuery.cs b/src/Carbunql.TypeSafe/FluentSelectQuery.cs
@@ -120,14 +120,8 @@ public FluentSelectQuery Where(Expression<Func<bool>> expression)
 
         var value = ToValue(expression.Body, prmManager.AddParaemter);
 
-        if (expression.Body is BinaryExpression be && be.NodeType == ExpressionType.OrElse)
-        {
-            this.Where($"({value})");
-        }
-        else
-        {
-            this.Where(value);
-        }
+        this.Where(value);
+
         return this;
     }
 

diff --git a/test/Carbunql.TypeSafe.Test/WhereTest.cs b/test/Carbunql.TypeSafe.Test/WhereTest.cs
@@ -119,7 +119,34 @@ public void OrTest()
 FROM
     sale AS a
 WHERE
-    ((a.quantity = 1) OR (a.unit_price = 2))";
+    (a.quantity = 1 OR a.unit_price = 2)";
+
+        Assert.Equal(expect, actual, true, true, true);
+    }
+
+    [Fact]
+    public void AndOrTest()
+    {
+        var a = Sql.DefineDataSet<sale>();
+
+        var query = Sql.From(() => a)
+            .Where(() =>
+                (a.quantity == 1 && a.unit_price == 1 || a.unit_price == 2)
+                && (a.unit_price == 2 || a.quantity == 1 && a.unit_price == 1)
+                && (a.unit_price == 1 || a.unit_price == 2)
+            );
+
+        var actual = query.ToText();
+        Output.WriteLine(query.ToText());
+
+        var expect = @"SELECT
+    *
+FROM
+    sale AS a
+WHERE
+    ((a.quantity = 1 AND a.unit_price = 1) OR a.unit_price = 2)
+    AND (a.unit_price = 2 OR (a.quantity = 1 AND a.unit_price = 1))
+    AND (a.unit_price = 1 OR a.unit_price = 2)";
 
         Assert.Equal(expect, actual, true, true, true);
     }