Merge pull request #4 from yv989c/develop

Ready for the world!

.github/workflows/ci-workflow.yml

@@ -60,14 +60,16 @@ jobs:
       # Tests
       - name: Build
         run: msbuild BlazarTech.QueryableValues.EF6.sln -property:Configuration=Release -property:RestorePackages=false
-      #- name: Tests
-      #  run: vstest.console.exe tests/QueryableValues.EF6.SqlServer.Tests.EF*/bin/Release/**/BlazarTech.QueryableValues.EF6.SqlServer.Tests.EF*.dll
       - name: Tests
-        uses: microsoft/[email protected]
-        with:
-          testAssembly: BlazarTech.QueryableValues.EF6.SqlServer.Tests.EF*.dll
-          searchFolder: ./tests/QueryableValues.EF6.SqlServer.Tests.EF*/bin/Release/**/
-          runInParallel: false
+        run: |
+          & "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
+        #uses: microsoft/[email protected]
+        #with:
+        #  testAssembly: BlazarTech.QueryableValues.EF6.SqlServer.Tests.EF*.dll
+        #  searchFolder: ./tests/QueryableValues.EF6.SqlServer.Tests.EF*/bin/Release/**/
+        #  runInParallel: false
+        #  vstestLocationMethod: location
+        #  vstestLocation: 'C:/Program Files/Microsoft Visual Studio/2022/Enterprise/Common7/IDE/Extensions/TestPlatform/vstest.console.exe'
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v2

README.md

@@ -2,7 +2,7 @@
     <img src="/docs/images/icon.png" alt="Logo" style="width: 80px;">
 </p>
 
-# QueryableValues for EF6
+# QueryableValues `EF6 Edition`
 
 [![MIT License](https://badgen.net/badge/license/MIT/blue)](https://github.com/yv989c/BlazarTech.QueryableValues.EF6/blob/main/LICENSE.md)
 [![GitHub Stars](https://badgen.net/github/stars/yv989c/BlazarTech.QueryableValues.EF6?icon=github)][Repository]
@@ -16,7 +16,7 @@ For a detailed explanation of the problem solved by QueryableValues, please cont
 
 > 💡 This is a streamlined version of the original [QueryableValues][QueryableValuesEFCoreRepository] for Entity Framework Core, which I have adapted to provide some of its features on [Entity Framework 6].
 
-> 💡 Are you on Entity Framework Core? Use [the original version][QueryableValuesEFCoreRepository] of QueryableValues instead.
+> 💡 Using Entity Framework Core? Then [the original version][QueryableValuesEFCoreRepository] of QueryableValues is what you need.
 
 ## When Should You Use It?
 The `AsQueryableValues` extension method is intended for queries that are dependent upon a *non-constant* sequence of external values. In such cases, the underlying SQL query will be efficient on subsequent executions.
@@ -31,7 +31,7 @@ Your ⭐ on [this repository][Repository] also helps! Thanks! 🖖🙂
 # Getting Started
 
 ## Installation
-QueryableValues for EF6 is distributed as a [NuGet Package]. You can install it using the command below in your NuGet Package Manager Console window in Visual Studio:
+QueryableValues `EF6 Edition` is distributed as a [NuGet Package]. You can install it using the command below in your NuGet Package Manager Console window in Visual Studio:
 
 `Install-Package BlazarTech.QueryableValues.EF6.SqlServer`
 

Version.xml

@@ -1,5 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<VersionPrefix>1.0.0-rc.2</VersionPrefix>
+		<VersionPrefix>1.0.0</VersionPrefix>
 	</PropertyGroup>
 </Project>

docs/README.md

@@ -1,4 +1,4 @@
-# QueryableValues for EF6
+# QueryableValues `EF6 Edition`
 
 [![MIT License](https://badgen.net/badge/license/MIT/blue)](https://github.com/yv989c/BlazarTech.QueryableValues.EF6/blob/main/LICENSE.md)
 [![GitHub Stars](https://badgen.net/github/stars/yv989c/BlazarTech.QueryableValues.EF6?icon=github)][Repository]
@@ -12,7 +12,7 @@ For a detailed explanation of the problem solved by QueryableValues, please cont
 
 > 💡 This is a streamlined version of the original [QueryableValues][QueryableValuesEFCoreRepository] for Entity Framework Core, which I have adapted to provide some of its features on [Entity Framework 6].
 
-> 💡 Are you on Entity Framework Core? Use [the original version][QueryableValuesEFCoreRepository] of QueryableValues instead.
+> 💡 Using Entity Framework Core? Then [the original version][QueryableValuesEFCoreRepository] of QueryableValues is what you need.
 
 ## When Should You Use It?
 The `AsQueryableValues` extension method is intended for queries that are dependent upon a *non-constant* sequence of external values. In such cases, the underlying SQL query will be efficient on subsequent executions.
@@ -27,7 +27,7 @@ Your ⭐ on [this repository][Repository] also helps! Thanks! 🖖🙂
 # Getting Started
 
 ## Installation
-QueryableValues for EF6 is distributed as a [NuGet Package]. You can install it using the command below in your NuGet Package Manager Console window in Visual Studio:
+QueryableValues `EF6 Edition` is distributed as a [NuGet Package]. You can install it using the command below in your NuGet Package Manager Console window in Visual Studio:
 
 `Install-Package BlazarTech.QueryableValues.EF6.SqlServer`
 

tests/QueryableValues.EF6.SqlServer.Tests.EF60/CodeFirst/TestDbContext.cs

@@ -11,9 +11,15 @@ public TestDbContext(string connectionString) : base(connectionString)
             Database.SetInitializer<TestDbContext>(null);
         }
 
-        public static TestDbContext Create()
+        public static TestDbContext Create(bool useDatabaseNullSemantics = false)
         {
-            return new TestDbContext(DbUtil.GetConnectionString(false));
+            return new TestDbContext(DbUtil.GetConnectionString(false))
+            {
+                Configuration =
+                {
+                    UseDatabaseNullSemantics = useDatabaseNullSemantics
+                }
+            };
         }
 
         protected override void OnModelCreating(DbModelBuilder modelBuilder)

tests/QueryableValues.EF6.SqlServer.Tests.EF60/DatabaseFirst/TestDbContext.Custom.cs

@@ -6,9 +6,15 @@ public TestDbContext(string connectionString) : base(connectionString)
         {
         }
 
-        public static TestDbContext Create()
+        public static TestDbContext Create(bool useDatabaseNullSemantics = false)
         {
-            return new TestDbContext(DbUtil.GetConnectionString(true));
+            return new TestDbContext(DbUtil.GetConnectionString(true))
+            {
+                Configuration =
+                {
+                    UseDatabaseNullSemantics = useDatabaseNullSemantics
+                }
+            };
         }
     }
 }

tests/QueryableValues.EF6.SqlServer.Tests.EF60/DbUtil.cs

@@ -18,5 +18,14 @@ public static string GetConnectionString(bool useDatabaseFirst)
                 return connectionString;
             }
         }
+
+        public static ITestDbContextWithSauce CreateDbContext(bool useDatabaseFirst, bool useDatabaseNullSemantics)
+        {
+            var dbContext = useDatabaseFirst ?
+                (ITestDbContextWithSauce)DatabaseFirst.TestDbContext.Create(useDatabaseNullSemantics) :
+                CodeFirst.TestDbContext.Create(useDatabaseNullSemantics);
+
+            return dbContext;
+        }
     }
 }

tests/QueryableValues.EF6.SqlServer.Tests.EF60/ITestDbContext.cs

@@ -1,4 +1,5 @@
-using System.Data.Entity;
+using System;
+using System.Data.Entity;
 
 namespace BlazarTech.QueryableValues.EF6.SqlServer.Tests
 {
@@ -7,7 +8,7 @@ public interface ITestDbContext
         DbSet<DatabaseFirst.TestDataEntity> TestData { get; set; }
     }
 
-    public interface ITestDbContextWithSauce : ITestDbContext, IQueryableValuesEnabledDbContext
+    public interface ITestDbContextWithSauce : ITestDbContext, IQueryableValuesEnabledDbContext, IDisposable
     {
     }
 }

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

@@ -18,30 +18,10 @@ public static IEnumerable<object[]> Data
         {
             get
             {
-                var options = new (bool WithCount, bool IsEmpty)[]
+                foreach (var option in TestUtil.GetTestDataOptions())
                 {
-                    (false, false),
-                    (false, true),
-                    (true, false),
-                    (true, true)
-                };
-
-#if NET5_0_OR_GREATER
-                foreach (var option in options)
-                {
-                    yield return new object[] { CodeFirst.TestDbContext.Create(), option.WithCount, option.IsEmpty };
-                }
-#else
-                foreach (var option in options)
-                {
-                    yield return new object[] { CodeFirst.TestDbContext.Create(), option.WithCount, option.IsEmpty };
+                    yield return new object[] { option.UseDatabaseFirst, option.UseDatabaseNullSemantics, option.WithCount, option.IsEmpty };
                 }
-
-                foreach (var option in options)
-                {
-                    yield return new object[] { DatabaseFirst.TestDbContext.Create(), option.WithCount, option.IsEmpty };
-                }
-#endif
             }
         }
 
@@ -57,10 +37,9 @@ private static int[] GetExpected(bool isEmpty, params int[] expected)
 
         [Theory]
         [MemberData(nameof(Data))]
-        public async Task Complex1<T>(T db, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public async Task Complex1(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
-            using (db)
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics))
             {
                 var sequence = GetSequence(getSequence(), withCount);
 
@@ -99,10 +78,9 @@ IEnumerable<short> getSequenceInt16()
 
         [Theory]
         [MemberData(nameof(Data))]
-        public async Task Complex2<T>(T db, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public async Task Complex2(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
-            using (db)
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics))
             {
                 var sequence = GetSequence(getSequence(), withCount);
 
@@ -156,10 +134,9 @@ IEnumerable<int> getSequenceInt32()
 
         [Theory]
         [MemberData(nameof(Data))]
-        public async Task Complex3<T>(T db, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public async Task Complex3(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
-            using (db)
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics))
             {
                 var sequenceStringUnicode = GetSequence(getSequenceString(), withCount);
                 var qvStringUnicode = db.AsQueryableValues(sequenceStringUnicode, isUnicode: true);
@@ -203,10 +180,9 @@ IEnumerable<int> getSequenceInt32()
 
         [Theory]
         [MemberData(nameof(Data))]
-        public async Task Complex4<T>(T db, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public async Task Complex4(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
-            using (db)
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics))
             {
                 var sequenceStringUnicode = GetSequence(getSequenceString(), withCount);
                 var qvStringUnicode = db.AsQueryableValues(sequenceStringUnicode, isUnicode: true);
@@ -258,11 +234,12 @@ IEnumerable<int> getSequenceInt32()
 
         [Theory]
         [MemberData(nameof(Data))]
-        public void DocsExamples<T>(T dbContext, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public void DocsExamples<T>(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
             IEnumerable<int> values = isEmpty ? Array.Empty<int>() : GetSequence(Enumerable.Range(1, 4), withCount);
 
+            using var dbContext = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics);
+
             {
                 var qvQuery = dbContext.AsQueryableValues(values);
 

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

@@ -18,30 +18,10 @@ public static IEnumerable<object[]> Data
         {
             get
             {
-                var options = new (bool WithCount, bool IsEmpty)[]
+                foreach (var option in TestUtil.GetTestDataOptions())
                 {
-                    (false, false),
-                    (false, true),
-                    (true, false),
-                    (true, true)
-                };
-
-#if NET5_0_OR_GREATER
-                foreach (var option in options)
-                {
-                    yield return new object[] { CodeFirst.TestDbContext.Create(), option.WithCount, option.IsEmpty };
-                }
-#else
-                foreach (var option in options)
-                {
-                    yield return new object[] { CodeFirst.TestDbContext.Create(), option.WithCount, option.IsEmpty };
-                }
-
-                foreach (var option in options)
-                {
-                    yield return new object[] { DatabaseFirst.TestDbContext.Create(), option.WithCount, option.IsEmpty };
+                    yield return new object[] { option.UseDatabaseFirst, option.UseDatabaseNullSemantics, option.WithCount, option.IsEmpty };
                 }
-#endif
             }
         }
 
@@ -57,10 +37,9 @@ private static int[] GetExpected(bool isEmpty, params int[] expected)
 
         [Theory]
         [MemberData(nameof(Data))]
-        public async Task Byte<T>(T db, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public async Task Byte(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
-            using (db)
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics))
             {
                 var sequence = GetSequence(getSequence(), withCount);
                 var qv = db.AsQueryableValues(sequence);
@@ -90,10 +69,9 @@ IEnumerable<byte> getSequence()
 
         [Theory]
         [MemberData(nameof(Data))]
-        public async Task Int16<T>(T db, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public async Task Int16(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
-            using (db)
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics))
             {
                 var sequence = GetSequence(getSequence(), withCount);
                 var qv = db.AsQueryableValues(sequence);
@@ -122,10 +100,9 @@ IEnumerable<short> getSequence()
 
         [Theory]
         [MemberData(nameof(Data))]
-        public async Task Int32<T>(T db, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public async Task Int32(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
-            using (db)
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics))
             {
                 var sequence = GetSequence(getSequence(), withCount);
                 var qv = db.AsQueryableValues(sequence);
@@ -156,10 +133,9 @@ IEnumerable<int> getSequence()
 
         [Theory]
         [MemberData(nameof(Data))]
-        public async Task Int64<T>(T db, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public async Task Int64(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
-            using (db)
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics))
             {
                 var sequence = GetSequence(getSequence(), withCount);
                 var qv = db.AsQueryableValues(sequence);
@@ -189,10 +165,9 @@ IEnumerable<long> getSequence()
 
         [Theory]
         [MemberData(nameof(Data))]
-        public async Task String<T>(T db, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public async Task String(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
-            using (db)
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics))
             {
                 var sequence = GetSequence(getSequence(), withCount);
                 var qv = db.AsQueryableValues(sequence, false);
@@ -222,10 +197,9 @@ IEnumerable<string> getSequence()
 
         [Theory]
         [MemberData(nameof(Data))]
-        public async Task StringUnicode<T>(T db, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public async Task StringUnicode(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
-            using (db)
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics))
             {
                 var sequence = GetSequence(getSequence(), withCount);
                 var qv = db.AsQueryableValues(sequence, true);
@@ -255,10 +229,9 @@ IEnumerable<string> getSequence()
 
         [Theory]
         [MemberData(nameof(Data))]
-        public async Task Guid<T>(T db, bool withCount, bool isEmpty)
-            where T : DbContext, ITestDbContext
+        public async Task Guid(bool useDatabaseFirst, bool useDatabaseNullSemantics, bool withCount, bool isEmpty)
         {
-            using (db)
+            using (var db = DbUtil.CreateDbContext(useDatabaseFirst, useDatabaseNullSemantics))
             {
                 var sequence = GetSequence(getSequence(), withCount);
                 var qv = db.AsQueryableValues(sequence);