Reconsidered approach, now clean and now utilizes the standard helper.ReplaceAll

Author: Michel Bieleveld

QueryBuilder.Tests/DefineTest.cs

@@ -28,6 +28,8 @@ public void Test_Define_Where()
         [Fact]
         public void Test_Define_Parameter_Where()
         {
+            // note parameters need to start with @ or any other standard parameter indicator for
+            // the library running the query.
             var query = new Query("Products")
                 .Define("@name", "Anto")
                 .DefineParameter("@param", "param")

QueryBuilder/Compilers/Compiler.cs

@@ -64,51 +64,35 @@ protected Compiler()
 
         };
 
-        protected Dictionary<string, object> generateNamedBindings(object[] bindings)
+        protected (string Name,object Variable)[] generateNamedBindingsArray(object[] bindings)
         {
-            return Helper.Flatten(bindings).Select((v, i) => new { i, v })
-                .ToDictionary(x => parameterPrefix + x.i, x => x.v);
-        }
-
-        protected Dictionary<string, string> generateNamedParameterMapping(Dictionary<string,object> namedBindings)
-        {
-            return namedBindings
-                .Where(v => v.Value is NamedParameterVariable _)
-                .ToDictionary(x => x.Key,
-                    x => ((NamedParameterVariable) x.Value).Variable);
-        }
-
-        protected string remapNamedParameters(string sql, Dictionary<string, string> mapping)
-        {
-            if (mapping.Count == 0) return sql;
-            var pattern = string.Join("|", mapping.Keys.Select(Regex.Escape));
-            return Regex.Replace(sql, pattern, match => mapping[match.Value]);
+            return Helper.Flatten(bindings).Select((v, i) =>
+            {
+                if (v is NamedParameterVariable param)
+                {
+                    return (param.Variable, param.Value);
+                }
+                return (parameterPrefix + i, v);
+            }).ToArray();
         }
 
-        protected Dictionary<string, object> cleanupNamedBindings(Dictionary<string, object> namedBindings)
+        protected Dictionary<string, object> generateNamedBindings((string, object)[] bindings)
         {
-            var result = new Dictionary<string, object>();
-
-            foreach (var (key, value) in namedBindings)
+            var dictionary = new Dictionary<string, object>();
+            foreach (var (name, variable) in bindings)
             {
-                var actualKey = value is NamedParameterVariable k ? k.Variable : key;
-                var actualValue = value is NamedParameterVariable v ? v.Value : value;
-
-                result.TryAdd(actualKey, actualValue);
+                dictionary.TryAdd(name, variable);
             }
 
-            return result;
+            return dictionary;
         }
 
 
         protected SqlResult PrepareResult(SqlResult ctx)
         {
-            ctx.NamedBindings = generateNamedBindings(ctx.Bindings.ToArray());
-            ctx.Sql = Helper.ReplaceAll(ctx.RawSql, parameterPlaceholder, EscapeCharacter, i => parameterPrefix + i);
-            var mapping = generateNamedParameterMapping(ctx.NamedBindings);
-            if (mapping.Count == 0) return ctx;
-            ctx.NamedBindings = cleanupNamedBindings(ctx.NamedBindings);
-            ctx.Sql = remapNamedParameters(ctx.Sql,mapping);
+            var bindings = generateNamedBindingsArray(ctx.Bindings.ToArray());
+            ctx.NamedBindings = generateNamedBindings(bindings);
+            ctx.Sql = Helper.ReplaceAll(ctx.RawSql, parameterPlaceholder, EscapeCharacter, i => bindings[i].Name);
             return ctx;
         }
 

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.TrimStart('@')}", value);
+            Variables.Add(variable, value);
 
             return this;
         }
@@ -384,8 +384,7 @@ public Query Define(string variable, object value)
         /// <returns></returns>
         public Query DefineParameter(string variable, object value)
         {
-            var name = $"@{variable.TrimStart('@')}";
-            Variables.Add(name, new NamedParameterVariable(name,value));
+            Variables.Add(variable, new NamedParameterVariable(variable,value));
 
             return this;
         }

QueryBuilder/Variable.cs

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