Merge pull request #11 from yv989c/develop

Reused parameter support

Author: yv989c

.github/workflows/ci-workflow.yml

@@ -39,7 +39,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup MSBuild
         uses: microsoft/[email protected]
@@ -65,7 +65,7 @@ jobs:
           & "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/Common7/IDE/Extensions/TestPlatform/vstest.console.exe" ./tests/QueryableValues.EF6.SqlServer.Tests.EF*/bin/Release/**/BlazarTech.QueryableValues.EF6.SqlServer.Tests.EF*.dll
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: nupkg
           path: ./src/QueryableValues.EF6.SqlServer/bin/Release/*.nupkg
@@ -75,7 +75,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: nupkg
       - name: Push to GitHub Feed
@@ -88,7 +88,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: nupkg
       - name: Push to GitHub Feed

Version.xml

@@ -1,5 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<VersionPrefix>1.1.0</VersionPrefix>
+		<VersionPrefix>1.1.1</VersionPrefix>
 	</PropertyGroup>
 </Project>

src/QueryableValues.EF6.SqlServer/QueryableValuesCommandInterceptor.cs

@@ -128,7 +128,14 @@ private static void TransformCommand(DbCommand command, DbCommandInterceptionCon
                                 _ => throw new NotImplementedException(),
                             };
 
-                            parameters.Add(valueParameterName, serializationFormat);
+#if NET452 || NET472
+                            if (!parameters.ContainsKey(valueParameterName))
+                            {
+                                parameters.Add(valueParameterName, serializationFormat);
+                            }                            
+#else
+                            parameters.TryAdd(valueParameterName, serializationFormat);
+#endif
 
 #if NET452 || NET472
                             sb.Append(originalCommandText.Substring(lastStartIndex, match2.Index - lastStartIndex));

tests/QueryableValues.EF6.SqlServer.Tests.EF60/Queries/ComplexTests.cs

@@ -131,7 +131,6 @@ IEnumerable<int> getSequenceInt32()
             }
         }
 
-
         [Theory]
         [MemberData(nameof(Data))]
         public async Task Complex3(bool useCompat120, bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
@@ -232,6 +231,57 @@ IEnumerable<int> getSequenceInt32()
             }
         }
 
+        [Theory]
+        [MemberData(nameof(Data))]
+        public async Task Complex5(bool useCompat120, bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
+        {
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics, useCompat120: useCompat120))
+            {
+                var sequenceStringUnicode = GetSequence(getSequenceString(), withCount);
+                var qvStringUnicode = db.AsQueryableValues(sequenceStringUnicode, isUnicode: true);
+
+                var sequenceInt32 = GetSequence(getSequenceInt32(), withCount);
+                var qvInt32 = db.AsQueryableValues(sequenceInt32);
+
+                var query =
+                    from e in db.TestData
+                    where qvStringUnicode.Contains(e.StringUnicodeValue) || qvInt32.Contains(e.Int32Value)
+                    select e;
+
+                var result = await query
+                    .GroupBy(x => new { x.Int32Value })
+                    .OrderByDescending(g => g.Key.Int32Value)
+                    .Select(g => g.FirstOrDefault().Id)
+                    .OrderBy(i => i)
+                    .ToListAsync();
+
+                var expected = GetExpected(isEmpty, 1, 2, 4);
+
+                Assert.Equal(expected, result);
+            }
+
+            IEnumerable<string> getSequenceString()
+            {
+                if (isEmpty)
+                {
+                    yield break;
+                }
+
+                yield return "你好！";
+                yield return "👋";
+            }
+
+            IEnumerable<int> getSequenceInt32()
+            {
+                if (isEmpty)
+                {
+                    yield break;
+                }
+
+                yield return 123;
+            }
+        }
+
         [Theory]
         [MemberData(nameof(Data))]
         public void DocsExamples<T>(bool useCompat120, bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)