v2.0.0

mtanneryd · Jun 19, 2023 · 0d53dfe · 0d53dfe
2 parents 71f351f + 98345e7
commit 0d53dfe
Show file tree

Hide file tree

Showing 20 changed files with 157 additions and 95 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,22 +6,13 @@ bin/
 obj/
 packages/
 .vs/
-/Tanneryd.BulkOperations.EF6/.vs
-/Tanneryd.BulkOperations.EF6/packages
-/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6/bin
-/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6/obj
-/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.NET47.Tests/bin
-/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.NET47.Tests/obj
-/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.NetCore.Tests/bin
-/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.NetCore.Tests/obj
-/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6/nuget_api.txt
-/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.nuspec
+.idea/
 *.nupkg
 *.user
-/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.Tests/EF/StebbingContext.cs
-Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.NetStd/nuget_api.txt
-/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.NET47.ModelFirst.Tests/bin/Debug
-/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.NET47.ModelFirst.Tests/obj
-Tanneryd.BulkOperations.EF6/.idea/
-Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.NET47.ModelFirst.Tests/bin/
+/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6/nuget_api.txt
+/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.nuspec
+
+
+
+
 
diff --git a/...ions.EF6.NET47.ModelFirst.Tests/Tanneryd.BulkOperations.EF6.NET47.ModelFirst.Tests.csproj b/...ions.EF6.NET47.ModelFirst.Tests/Tanneryd.BulkOperations.EF6.NET47.ModelFirst.Tests.csproj
@@ -17,6 +17,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
+	<LangVersion>Latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/...F6/Tanneryd.BulkOperations.EF6.NET47.Tests/Tanneryd.BulkOperations.EF6.NET47.Tests.csproj b/...F6/Tanneryd.BulkOperations.EF6.NET47.Tests/Tanneryd.BulkOperations.EF6.NET47.Tests.csproj
@@ -18,6 +18,7 @@
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+	<LangVersion>Latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/...ulkOperations.EF6/Tanneryd.BulkOperations.EF6.NET47.Tests/Tests/Update/BulkUpdateTests.cs b/...ulkOperations.EF6/Tanneryd.BulkOperations.EF6.NET47.Tests/Tests/Update/BulkUpdateTests.cs
@@ -14,11 +14,13 @@
 * limitations under the License.
 */
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tanneryd.BulkOperations.EF6.Model;
 using Tanneryd.BulkOperations.EF6.NET47.Tests.Models.DM.Blog;
+using Tanneryd.BulkOperations.EF6.NET47.Tests.Models.DM.Prices;
 using Tanneryd.BulkOperations.EF6.NET47.Tests.Models.EF;
 
 namespace Tanneryd.BulkOperations.EF6.NET47.Tests.Tests.Update
@@ -39,6 +41,75 @@ public void CleanUp()
             CleanupUnitTestContext();
         }
 
+        [TestMethod]
+        public void ModifiedEntitiesWithNullableColumnShouldBeUpdated()
+        {
+            using var db1 = new UnitTestContext();
+            using var db2 = new UnitTestContext();
+            var initialPrices = new Price[]
+            {
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "A",
+                    Value = 1m
+                },
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "B",
+                    Value = null
+                },
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "C",
+                    Value = null
+                },
+            };
+            db1.Prices.AddRange(initialPrices);
+            db1.SaveChanges();
+
+            var updatedPrices = new Price[]
+            {
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "A",
+                    Value = 1.50m
+                },
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "B",
+                    Value = null
+                },
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "C",
+                    Value = 2.0m
+                },
+            };
+
+            db1.BulkUpdateAll(new BulkUpdateRequest
+            {
+                Entities = updatedPrices,
+                KeyPropertyNames = new[] { "Date", "Name" },
+                UpdatedColumnNames = new[] { "Value" },
+            });
+            var prices = db2.Prices.OrderBy(p => p.Name).ToArray();
+            Assert.AreEqual("A", prices[0].Name);
+            Assert.AreEqual(new DateTime(2023, 5, 29), prices[0].Date);
+            Assert.AreEqual(1.50m, prices[0].Value);
+            Assert.AreEqual("B", prices[1].Name);
+            Assert.AreEqual(new DateTime(2023, 5, 29), prices[1].Date);
+            Assert.AreEqual(null, prices[1].Value);
+            Assert.AreEqual("C", prices[2].Name);
+            Assert.AreEqual(new DateTime(2023, 5, 29), prices[2].Date);
+            Assert.AreEqual(2.0m, prices[2].Value);
+        }
+
         [TestMethod]
         public void ModifiedEntityShouldBeUpdated()
         {

diff --git a/...anneryd.BulkOperations.EF6.NETCore.Tests/Tanneryd.BulkOperations.EF6.NETCore.Tests.csproj b/...anneryd.BulkOperations.EF6.NETCore.Tests/Tanneryd.BulkOperations.EF6.NETCore.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+	<LangVersion>Latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.csproj b/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6/Tanneryd.BulkOperations.EF6.csproj
@@ -15,6 +15,7 @@
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<EmbedAllSources>True</EmbedAllSources>
+		<LangVersion>Latest</LangVersion>
   </PropertyGroup>
 
 	<ItemGroup>

diff --git a/...d.BulkOperations.EFCore/Tanneryd.BulkOperations.EFCore.Tests/Models/EF/UnitTestContext.cs b/...d.BulkOperations.EFCore/Tanneryd.BulkOperations.EFCore.Tests/Models/EF/UnitTestContext.cs
@@ -63,8 +63,8 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             if (!optionsBuilder.IsConfigured)
             {
-                //optionsBuilder.UseSqlServer(@"data source=.\SQLEXPRESS;initial catalog=Tanneryd.BulkOperations.EFCore.Tests.Models.EF.UnitTestContext;persist security info=True;Integrated Security=SSPI;MultipleActiveResultSets=True");
-                optionsBuilder.UseSqlServer(@"data source=(localdb)\MSSQLLocalDB;initial catalog=Tanneryd.BulkOperations.EFCore.Tests.Models.EF.UnitTestContext;persist security info=True;Integrated Security=SSPI;MultipleActiveResultSets=True");
+                optionsBuilder.UseSqlServer(@"data source=.\SQLEXPRESS;initial catalog=Tanneryd.BulkOperations.EFCore.Tests.Models.EF.UnitTestContext;persist security info=True;Integrated Security=SSPI;MultipleActiveResultSets=True;TrustServerCertificate=true");
+                //optionsBuilder.UseSqlServer(@"data source=(localdb)\MSSQLLocalDB;initial catalog=Tanneryd.BulkOperations.EFCore.Tests.Models.EF.UnitTestContext;persist security info=True;Integrated Security=SSPI;MultipleActiveResultSets=True;TrustServerCertificate=true");
             }
         }
 

diff --git a/...s.EFCore/Tanneryd.BulkOperations.EFCore.Tests/Tanneryd.BulkOperations.EFCore.Tests.csproj b/...s.EFCore/Tanneryd.BulkOperations.EFCore.Tests/Tanneryd.BulkOperations.EFCore.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
+ 	<LangVersion>Latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...perations.EFCore/Tanneryd.BulkOperations.EFCore.Tests/UnitTests/Update/BulkUpdateTests.cs b/...perations.EFCore/Tanneryd.BulkOperations.EFCore.Tests/UnitTests/Update/BulkUpdateTests.cs
@@ -14,6 +14,7 @@
 * limitations under the License.
 */
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -37,6 +38,75 @@ public void CleanUp()
             CleanupUnitTestContext();
         }
 
+        [TestMethod]
+        public void ModifiedEntitiesWithNullableColumnShouldBeUpdated()
+        {
+            using var db1 = new UnitTestContext();
+            using var db2 = new UnitTestContext();
+            var initialPrices = new Price[]
+            {
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "A",
+                    Value = 1m
+                },
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "B",
+                    Value = null
+                },
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "C",
+                    Value = null
+                },
+            };
+            db1.Prices.AddRange(initialPrices);
+            db1.SaveChanges();
+
+            var updatedPrices = new Price[]
+            {
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "A",
+                    Value = 1.50m
+                },
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "B",
+                    Value = null
+                },
+                new Price
+                {
+                    Date = new DateTime(2023, 5, 29),
+                    Name = "C",
+                    Value = 2.0m
+                },
+            };
+
+            db1.BulkUpdateAll(new BulkUpdateRequest
+            {
+                Entities = updatedPrices,
+                KeyPropertyNames = new[] { "Date", "Name" },
+                UpdatedColumnNames = new[] { "Value" },
+            });
+            var prices = db2.Prices.OrderBy(p=>p.Name).ToArray();
+            Assert.AreEqual("A",prices[0].Name );
+            Assert.AreEqual(new DateTime(2023, 5, 29), prices[0].Date);
+            Assert.AreEqual(1.50m, prices[0].Value);
+            Assert.AreEqual("B",prices[1].Name);
+            Assert.AreEqual(new DateTime(2023, 5, 29), prices[1].Date);
+            Assert.AreEqual(null, prices[1].Value);
+            Assert.AreEqual("C", prices[2].Name);
+            Assert.AreEqual(new DateTime(2023, 5, 29), prices[2].Date);
+            Assert.AreEqual(2.0m, prices[2].Value);
+        }
+
         [TestMethod]
         public void ModifiedEntityShouldBeUpdated()
         {

diff --git a/...ations.EFCore.Tests/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.Tests.AssemblyInfo.cs b/...ations.EFCore.Tests/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.Tests.AssemblyInfo.cs
diff --git a/...Core.Tests/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.Tests.AssemblyInfoInputs.cache b/...Core.Tests/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.Tests.AssemblyInfoInputs.cache
diff --git a/...bug/net7.0/Tanneryd.BulkOperations.EFCore.Tests.GeneratedMSBuildEditorConfig.editorconfig b/...bug/net7.0/Tanneryd.BulkOperations.EFCore.Tests.GeneratedMSBuildEditorConfig.editorconfig
diff --git a/...ests/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.Tests.csproj.AssemblyReference.cache b/...ests/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.Tests.csproj.AssemblyReference.cache
diff --git a/...ulkOperations.EFCore/Tanneryd.BulkOperations.EFCore/Tanneryd.BulkOperations.EFCore.csproj b/...ulkOperations.EFCore/Tanneryd.BulkOperations.EFCore/Tanneryd.BulkOperations.EFCore.csproj
@@ -16,6 +16,7 @@
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<EmbedAllSources>True</EmbedAllSources>
+		<LangVersion>Latest</LangVersion>
   </PropertyGroup>
 
 	<ItemGroup>

diff --git a/...ryd.BulkOperations.EFCore/obj/Debug/net7.0/.NETCoreApp,Version=v7.0.AssemblyAttributes.cs b/...ryd.BulkOperations.EFCore/obj/Debug/net7.0/.NETCoreApp,Version=v7.0.AssemblyAttributes.cs
diff --git a/...ryd.BulkOperations.EFCore/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.AssemblyInfo.cs b/...ryd.BulkOperations.EFCore/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.AssemblyInfo.cs
diff --git a/...perations.EFCore/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.AssemblyInfoInputs.cache b/...perations.EFCore/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.AssemblyInfoInputs.cache
diff --git a/...obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.GeneratedMSBuildEditorConfig.editorconfig b/...obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.GeneratedMSBuildEditorConfig.editorconfig
diff --git a/...ons.EFCore/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.csproj.AssemblyReference.cache b/...ons.EFCore/obj/Debug/net7.0/Tanneryd.BulkOperations.EFCore.csproj.AssemblyReference.cache
diff --git a/nuget.config b/nuget.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="netmw_feed" value="https://pkgs.dev.azure.com/marketmath/NetMW/_packaging/netmw_feed/nuget/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>