Merge remote-tracking branch 'origin/master' into dba-load-csv-from-delve

Author: David Bach

DelveClientSDK/GeneratedDelveClient.cs

@@ -110,6 +110,16 @@ public async System.Threading.Tasks.Task<TransactionResult> TransactionAsync(Tra
                             return objectResponse_.Object;
                         }
                         else
+                        if (status_ == 422)
+                        {
+                            var objectResponse_ = await ReadObjectResponseAsync<TransactionResult>(response_, headers_).ConfigureAwait(false);
+                            if (objectResponse_.Object == null)
+                            {
+                                throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
+                            }
+                            throw new ApiException<TransactionResult>("The transaction was aborted. The result is wrapped inside a TransactionResult", status_, objectResponse_.Text, headers_, objectResponse_.Object, null);
+                        }
+                        else
                         if (status_ == 403)
                         {
                             var objectResponse_ = await ReadObjectResponseAsync<InfraError>(response_, headers_).ConfigureAwait(false);

DelveClientSDKTests/IntegrationTestsCommons.cs

@@ -70,7 +70,8 @@ public static void RunAllTests(ConnFunc connFunc)
             // create_database
             // =============================================================================
             Assert.IsTrue(conn.CreateDatabase(overwrite: true));
-            Assert.Throws<Exception>(() => conn.CreateDatabase());
+            var ex1 = Assert.Throws<AggregateException>(() => conn.CreateDatabase());
+            Assert.AreEqual(typeof(ApiException<TransactionResult>), ex1.InnerException.GetType());
 
             // install_source
             // =============================================================================
@@ -168,7 +169,9 @@ public static void RunAllTests(ConnFunc connFunc)
             queryResEquals(conn3.Query(output: "x"), ToRelData( 1L, 2L, 3L, 4L ));
 
             // Try to clone from conn to conn2, without passing overwrite=true
-            Assert.Throws<Exception>(() => conn2.CloneDatabase(conn));
+            var ex2 = Assert.Throws<AggregateException>(() => conn2.CloneDatabase(conn));
+            Assert.AreEqual(typeof(ApiException<TransactionResult>), ex2.InnerException.GetType());
+						
             queryResEquals(conn.Query(output: "x"), ToRelData( 1L, 2L, 3L, 4L ));
             queryResEquals(conn2.Query(output: "x"), ToRelData( 1L, 2L, 3L, 5L ));
             queryResEquals(conn3.Query(output: "x"), ToRelData( 1L, 2L, 3L, 4L ));