Merge pull request PostgreSQLCopyHelper#48 from PostgreSQLCopyHelper/…

…2.5.0-alpha

2.5.0

.vscode/settings.json

@@ -0,0 +1,13 @@
+{
+    "cSpell.words": [
+        "Inet",
+        "Npgsql",
+        "Postgres",
+        "bigint",
+        "bytea",
+        "macaddr",
+        "philipp",
+        "smallint",
+        "ulong"
+    ]
+}

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG #
 
+## 2.5.0 ##
+
+* [See Changes](https://github.com/bytefish/PostgreSQLCopyHelper/compare/2.4.0...2.5.0)
+
+#### This release: 
+- Drops support for `net45`, `net451` and `net452`
+- Upgrades Npgsql to 4.1
+- SaveAll now returns a count of rows written
+
 ## 2.4.2 ##
 
 * [See Changes](https://github.com/bytefish/PostgreSQLCopyHelper/compare/2.3.0...2.4.2)
@@ -82,4 +91,4 @@ Adding .netstandard1.3 as Target Framework to support .NET Core.
 
 * [See Changes](https://github.com/bytefish/PostgreSQLCopyHelper/compare/0.2...1.0.0)
 
-Initial Release.
+Initial Release.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Philipp Wagner and Contributors
+Copyright (c) Philipp Wagner, Steven Yeh and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

PostgreSQLCopyHelper/PostgreSQLCopyHelper/NuGet.config

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="npgsql-unstable myget" value="https://www.myget.org/F/npgsql-unstable/api/v3/index.json" protocolVersion="3" />
+  </packageSources>
+  <packageRestore>
+    <add key="enabled" value="True" />
+    <add key="automatic" value="True" />
+  </packageRestore>
+  <bindingRedirects>
+    <add key="skip" value="False" />
+  </bindingRedirects>
+  <packageManagement>
+    <add key="format" value="1" />
+    <add key="disabled" value="False" />
+  </packageManagement>
+  <disabledPackageSources />
+  <config>
+    <add key="dependencyVersion" value="HighestPatch" />
+  </config>
+</configuration>

PostgreSQLCopyHelper/PostgreSQLCopyHelper/PostgreSQLCopyHelper.Test/ArrayTypesTest.cs

@@ -1,5 +1,4 @@
-// Copyright (c) Philipp Wagner. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
 using System.Collections.Generic;
@@ -66,12 +65,13 @@ public void Test_StringArray()
                 Array = new[] { "A", "B" }
             };
 
-            subject.SaveAll(connection, new[] { entity0 });
+            var recordsSaved = subject.SaveAll(connection, new[] { entity0 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(1, result.Count);
+            Assert.AreEqual(1, recordsSaved);
 
             // Check if the Result is not null:
             Assert.IsNotNull(result[0][0]);
@@ -311,7 +311,7 @@ private int CreateTable(string arrayType)
             return sqlCommand.ExecuteNonQuery();
         }
 
-        private List<object[]> GetAll()
+        private IList<object[]> GetAll()
         {
             return connection.GetAll("sample", "unit_test");
         }

PostgreSQLCopyHelper/PostgreSQLCopyHelper/PostgreSQLCopyHelper.Test/BasicDataTypesTests.cs

@@ -1,5 +1,4 @@
-// Copyright (c) Philipp Wagner. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
 using System.Collections.Generic;
@@ -69,9 +68,6 @@ protected override void OnSetupInTransaction()
                 .MapTimeTz("col_timetz_time_span", x => x.TimeSpan_TimeTz)
                 .MapTimeTz("col_timetz_date_time", x => x.DateTime_TimeTz)
                 .MapTimeTz("col_timetz_date_time_offset", x => x.DateTimeOffset_TimeTz);
-
-
-
         }
 
         private int CreateTable()
@@ -114,8 +110,7 @@ public void Test_TimeStampTz_DateTimeOffset()
             {
                 DateTimeOffset_TimestampTz = new DateTimeOffset(2019, 1, 1, 22, 0, 0, TimeSpan.Zero)
             };
-
-
+
             subject.SaveAll(connection, new[] { entity0 });
 
             var result = GetAll();
@@ -168,12 +163,13 @@ public void Test_NullableSmallInt()
                 SmallInt = Int16.MaxValue
             };
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordsSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordsSaved);
 
             Assert.IsNotNull(result[0][0]);
             Assert.IsNotNull(result[1][0]);
@@ -185,7 +181,6 @@ public void Test_NullableSmallInt()
         [Test]
         public void Test_NullableInteger()
         {
-
             var entity0 = new TestEntity()
             {
                 Integer = Int32.MinValue
@@ -196,12 +191,13 @@ public void Test_NullableInteger()
                 Integer = Int32.MaxValue
             };
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordSaved);
 
             Assert.IsNotNull(result[0][1]);
             Assert.IsNotNull(result[1][1]);
@@ -213,7 +209,6 @@ public void Test_NullableInteger()
         [Test]
         public void Test_NullableMoney()
         {
-
             var entity0 = new TestEntity()
             {
                 Money = -1234567890123.45M
@@ -224,12 +219,13 @@ public void Test_NullableMoney()
                 Money = 92233720368547758.07M
             };
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordSaved);
 
             Assert.IsNotNull(result[0][2]);
             Assert.IsNotNull(result[1][2]);
@@ -241,7 +237,6 @@ public void Test_NullableMoney()
         [Test]
         public void Test_NullableNumeric()
         {
-
             var entity0 = new TestEntity()
             {
                 Numeric = Decimal.MinValue
@@ -252,12 +247,13 @@ public void Test_NullableNumeric()
                 Numeric = Decimal.MaxValue
             };
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordSaved);
 
             Assert.AreEqual(entity0.Numeric, (Decimal) result[0][9]);
             Assert.AreEqual(entity1.Numeric, (Decimal) result[1][9]);
@@ -276,12 +272,13 @@ public void Test_NullableBigint()
                 BigInt = Int64.MaxValue
             };
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordSaved);
 
             Assert.IsNotNull(result[0][3]);
             Assert.IsNotNull(result[1][3]);
@@ -348,12 +345,13 @@ public void Test_NullableReal()
                 Real = Single.MaxValue
             };
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordSaved);
 
             Assert.IsNotNull(result[0][5]);
             Assert.IsNotNull(result[1][5]);
@@ -375,12 +373,13 @@ public void Test_NullableDouble()
                 DoublePrecision = Double.MaxValue
             };
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordSaved);
 
             Assert.AreEqual(entity0.DoublePrecision, (Double) result[0][6]);
             Assert.AreEqual(entity1.DoublePrecision, (Double) result[1][6]);
@@ -394,12 +393,13 @@ public void Test_ByteArray()
                 ByteArray = new byte[] { 1, 2, 3 }
             };
 
-            subject.SaveAll(connection, new[] { entity0 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(1, result.Count);
+            Assert.AreEqual(1, recordSaved);
 
             Assert.AreEqual(entity0.ByteArray[0], ((byte[]) result[0][7])[0]);
             Assert.AreEqual(entity0.ByteArray[1], ((byte[]) result[0][7])[1]);
@@ -419,12 +419,13 @@ public void Test_NullableUUID()
                 UUID = Guid.NewGuid()
             };
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordSaved);
 
             Assert.AreEqual(entity0.UUID, (Guid) result[0][8]);
             Assert.AreEqual(entity1.UUID, (Guid) result[1][8]);
@@ -443,12 +444,13 @@ public void Test_NullableDate()
                 Date = DateTime.UtcNow
             };
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordSaved);
 
             Assert.IsNotNull(result[0][12]);
             Assert.IsNotNull(result[1][12]);
@@ -479,12 +481,13 @@ public void Test_IpAddress()
                 IpAddress = IPAddress.Parse("1.2.3.4")
             };
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordSaved);
 
             Assert.IsNotNull(result[0][10]);
             Assert.IsNotNull(result[1][10]);
@@ -510,12 +513,13 @@ public void Test_MacAddress()
                 MacAddress = PhysicalAddress.Parse("01-02-2B-01-02-03")
             };
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordsSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordsSaved);
 
             Assert.IsNotNull(result[0][11]);
             Assert.IsNotNull(result[1][11]);
@@ -542,12 +546,13 @@ public void Test_NullableTimeSpan()
             };
 
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordsSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordsSaved);
 
             Assert.AreEqual(entity0.TimeSpan, (TimeSpan) result[0][13]);
             Assert.AreEqual(entity1.TimeSpan, (TimeSpan) result[1][13]);
@@ -574,12 +579,13 @@ public void Test_Json()
             };
 
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordSaved);
 
             Assert.IsNotNull(result[0][14]);
             Assert.IsNotNull(result[1][14]);
@@ -613,20 +619,21 @@ public void Test_Jsonb()
             };
 
 
-            subject.SaveAll(connection, new[] { entity0, entity1 });
+            var recordSaved = subject.SaveAll(connection, new[] { entity0, entity1 });
 
             var result = GetAll();
 
             // Check if we have the amount of rows:
             Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordSaved);
 
             Assert.IsNotNull(result[0][15]);
             Assert.IsNotNull(result[1][15]);
 
             // TODO: More Useful Test for JSON equality here...
         }
-
-        private List<object[]> GetAll()
+        
+        private IList<object[]> GetAll()
         {
             return connection.GetAll("sample", "unit_test");
         }