Replace complete db params [@1] and not partial tokens [@1]0

Author: mythz

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -8,6 +8,7 @@
 using System.Collections.ObjectModel;
 using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
+using System.Text.RegularExpressions;
 using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite
@@ -2112,7 +2113,9 @@ protected string ConvertInExpressionToSql(MethodCallExpression m, object quotedC
 
                 for (var i = renameParams.Count - 1; i >= 0; i--)
                 {
-                    subSelect = subSelect.Replace(renameParams[i].Item1, renameParams[i].Item2);
+                    //Replace complete db params [@1] and not partial tokens [@1]0
+                    var paramsRegex = new Regex(renameParams[i].Item1 + "([^\\d])");
+                    subSelect = paramsRegex.Replace(subSelect, renameParams[i].Item2 + "$1");
                 }
 
                 return $"{quotedColName} IN ({subSelect})";

tests/ServiceStack.OrmLite.Tests/Issues/MergeParamsIssue.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using ServiceStack.OrmLite.Tests.Shared;
+using ServiceStack.Text;
+
+namespace ServiceStack.OrmLite.Tests.Issues
+{
+    public class Record
+    {
+        public int Id { get; set; }
+        public int Value { get; set; }
+    }
+
+    [TestFixture]
+    public class MergeParamsIssue : OrmLiteTestBase
+    {
+        [Test]
+        public void Does_merge_params_correctly()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<Record>();
+
+                db.InsertAll(new[] {
+                    new Record { Id = 1, Value = 1, },
+                });
+
+                var x1 = db.SingleById<Record>(1);
+                var q = db.From<Record>();
+                q.Where(x => x.Value == 1);
+                q.Where(x => x.Value == 1);
+                q.Where(x => x.Value == 1);
+                q.Where(x => x.Value == 1);
+                q.Where(x => x.Value == 1);
+                q.Where(x => x.Value == 1);
+                q.Where(x => x.Value == 1);
+                q.Where(x => x.Value == 1);
+
+                var qIn = db.From<Record>();
+                qIn.Where(x => x.Value == 1);
+                qIn.Where(x => x.Value == 1 && x.Value == 1);
+                q.Where(x => Sql.In(x.Value, qIn));
+                var expression = q.ToSelectStatement();
+                expression.Print();
+
+                for (var i = 0; i < 11; i++)
+                {
+                    Assert.That(expression, Does.Contain(db.GetDialectProvider().ParamString + i));
+                }
+            }
+        }
+    }
+}

tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj

@@ -145,6 +145,7 @@
     <Compile Include="Expression\SqlExpressionJoinTests.cs" />
     <Compile Include="Issues\JoinAliasWithSchemaIssue.cs" />
     <Compile Include="Issues\LoadReferencesNullReferenceIssue.cs" />
+    <Compile Include="Issues\MergeParamsIssue.cs" />
     <Compile Include="UseCase\CustomerOrdersUseCaseAsync.cs" />
     <Compile Include="AutoQueryTests.cs" />
     <Compile Include="CaptureSqlCommandFilterTests.cs" />