Destroy appender if create fails

Giorgi · Dec 20, 2022 · dba806d · dba806d
1 parent 4124df8
commit dba806d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/DuckDB.NET.Data/DuckDBConnection.cs b/DuckDB.NET.Data/DuckDBConnection.cs
@@ -100,7 +100,14 @@ public DuckDBAppender CreateAppender(string table)
         {
             if (NativeMethods.Appender.DuckDBAppenderCreate(NativeConnection, null, table, out var nativeAppender) == DuckDBState.DuckDBError)
             {
-                DuckDBAppender.ThrowLastError(nativeAppender);
+                try
+                {
+                    DuckDBAppender.ThrowLastError(nativeAppender);
+                }
+                finally
+                {
+                    nativeAppender.Close();
+                }
             }
 
             return new DuckDBAppender(nativeAppender);

diff --git a/DuckDB.NET.Test/ManagedAppenderTests.cs b/DuckDB.NET.Test/ManagedAppenderTests.cs
@@ -161,5 +161,31 @@ public void WrongTypesThrowException()
                     .EndRow();
             }).Should().Throw<DuckDBException>();
         }
+
+        [Fact]
+        public void ClosedAdapterThrowException()
+        {
+            using var connection = new DuckDBConnection("DataSource=:memory:");
+            connection.Open();
+
+            using (var duckDbCommand = connection.CreateCommand())
+            {
+                var table = "CREATE TABLE managedAppenderClosedAdapterTest(a BOOLEAN, c Date, b TINYINT);";
+                duckDbCommand.CommandText = table;
+                duckDbCommand.ExecuteNonQuery();
+            }
+
+            connection.Invoking(dbConnection =>
+            {
+                using var appender = dbConnection.CreateAppender("managedAppenderClosedAdapterTest");
+                appender.Close();
+                var row = appender.CreateRow();
+                row
+                    .AppendValue(false)
+                    .AppendValue((byte)1)
+                    .AppendValue((short?)1)
+                    .EndRow();
+            }).Should().Throw<InvalidOperationException>();
+        }
     }
 }