Cleaned up test

Author: Michel Bieleveld

QueryBuilder.Tests/DefineTest.cs

@@ -74,27 +74,23 @@ public void Test_Define_SubQuery()
         public void Test_Define_Parameter_SubQuery()
         {
 
-            var subquery = new Query("Products")
-                .AsAverage("unitprice")
-                .DefineParameter("@UnitsInSt", 10)
-                .Where("UnitsInStock", ">", Variable("@UnitsInSt"))
-                .Where("UnitsInStock", ">", Variable("@UnitsInSt"));
-
             var query = new Query("Products")
-                .Where("unitprice", ">", subquery)
-                .Where("UnitsOnOrder", ">", 5);
-
-            var c = Compile(query);
-
-            Assert.Equal("SELECT * FROM [Products] WHERE [unitprice] > (SELECT AVG([unitprice]) AS [avg] FROM [Products] WHERE"+
-                         " [UnitsInStock] > 10 AND [UnitsInStock] > 10) AND [UnitsOnOrder] > 5", c[EngineCodes.SqlServer]);
+                .DefineParameter("@a", 1)
+                .DefineParameter("@b","b")
+                .Where(q=> q.Where("a", "=", Variable("@a")))
+                .OrWhere(q =>
+                    q.Where("a", "=", Variable("@a"))
+                        .Where("b",">",Variable("@b"))
+                        .Where("a",">",0));
 
             var s = Compilers.Compile(query)[EngineCodes.SqlServer];
-            Assert.Equal(2,s.NamedBindings.Count);
+            Assert.Equal("SELECT * FROM [Products] WHERE ([a] = @a) OR ([a] = @a AND [b] > @b AND [a] > @p3)", s.Sql);
+            Assert.Equal(3,s.NamedBindings.Count);
             var expected = new Dictionary<string, object>()
             {
-                { "@UnitsInSt", 10 },
-                { "@p2", 5 }
+                { "@a", 1 },
+                { "@b", "b" },
+                { "@p3", 0 }
             };
             Assert.Equal(expected, s.NamedBindings);
         }

QueryBuilder.Tests/MySql/MySqlExecutionTest.cs

@@ -1,13 +1,12 @@
+using System.Collections.Generic;
+using System.Linq;
+using MySql.Data.MySqlClient;
 using SqlKata.Compilers;
-using Xunit;
 using SqlKata.Execution;
-using MySql.Data.MySqlClient;
-using System;
-using System.Linq;
+using Xunit;
 using static SqlKata.Expressions;
-using System.Collections.Generic;
 
-namespace SqlKata.Tests
+namespace SqlKata.Tests.MySql
 {
     public class MySqlExecutionTest
     {
@@ -134,6 +133,37 @@ public void QueryWithVariable()
             db.Drop("Cars");
         }
 
+        [Fact]
+        public void QueryWithParameter()
+        {
+            var db = DB().Create("Cars", new[] {
+                "Id INT PRIMARY KEY AUTO_INCREMENT",
+                "Brand TEXT NOT NULL",
+                "Year INT NOT NULL",
+                "Color TEXT NULL",
+            });
+
+            for (int i = 0; i < 10; i++)
+            {
+                db.Query("Cars").Insert(new
+                {
+                    Brand = "Brand " + i,
+                    Year = "2020",
+                });
+            }
+
+
+            var count = db.Query("Cars")
+                .DefineParameter("Threshold", 5)
+                .Where("Id", "<", Variable("Threshold"))
+                .Where("Id", "<", Variable("Threshold"))
+                .Count<int>();
+
+            Assert.Equal(4, count);
+
+            db.Drop("Cars");
+        }
+
         [Fact]
         public void InlineTable()
         {

QueryBuilder.Tests/MySql/docker-compose.yaml

@@ -0,0 +1,13 @@
+# Use root/my-secret-pw as user/password credentials
+version: '3.1'
+
+services:
+
+  db:
+    image: mysql
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: my-secret-pw
+      MYSQL_DATABASE: test
+    ports:
+      - "3306:3306"

QueryBuilder/NamedParameter.cs QueryBuilder/NamedParameterVariable.csQueryBuilder/NamedParameter.cs renamed to QueryBuilder/NamedParameterVariable.cs

@@ -1,10 +1,5 @@
 namespace SqlKata;
 
-// public class NamedParameter(object value)
-// {
-//     public object Value { get; set; } = value;
-// }
-
 public class NamedParameterVariable(string variable, object value)
 {
     public object Value { get; set; } = value;

QueryBuilder/Query.cs

@@ -371,7 +371,7 @@ public Query IncludeMany(string relationName, Query query, string foreignKey = n
         /// <returns></returns>
         public Query Define(string variable, object value)
         {
-            Variables.Add(variable, value);
+            Variables.Add($"@{variable.TrimStart('@')}", value);
 
             return this;
         }
@@ -384,7 +384,8 @@ public Query Define(string variable, object value)
         /// <returns></returns>
         public Query DefineParameter(string variable, object value)
         {
-            Variables.Add(variable, new NamedParameterVariable(variable,value));
+            var name = $"@{variable.TrimStart('@')}";
+            Variables.Add(name, new NamedParameterVariable(name,value));
 
             return this;
         }

QueryBuilder/Variable.cs

@@ -6,7 +6,7 @@ public class Variable
 
         public Variable(string name)
         {
-            this.Name = name;
+            this.Name = $"@{name.TrimStart('@')}";
         }
 
     }