Merge branch 'main' into develop

Author: Giorgi

DuckDB.NET.Data/Data.csproj

@@ -6,9 +6,10 @@
 - Updated to DuckDB v1.5.3
 
 New features:
-- Projection pushdown for table functions.
-- Estimated cardinality hints for table functions.
-- IList<T> column support in table functions.
+- Improved support for binding ICollection parameters (#326)
+
+Fixes:
+- Fixed ObjectDisposedException in enum appender (#327)
     </PackageReleaseNotes>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\keyPair.snk</AssemblyOriginatorKeyFile>

DuckDB.NET.Data/DuckDBDataReader.cs

@@ -38,18 +38,18 @@ internal DuckDBDataReader(DuckDBCommand command, IEnumerable<DuckDBResult> query
 
     private bool InitNextReader()
     {
-        foreach (var reader in vectorReaders)
-        {
-            reader?.Dispose();
-        }
-
-        vectorReaders = [];
-
         while (resultEnumerator.MoveNext())
         {
             var result = resultEnumerator.Current;
             if (NativeMethods.Query.DuckDBResultReturnType(result) == DuckDBResultType.QueryResult)
             {
+                foreach (var reader in vectorReaders)
+                {
+                    reader?.Dispose();
+                }
+
+                vectorReaders = [];
+
                 currentChunkIndex = 0;
                 currentResult = result;
 

DuckDB.NET.Data/Extensions/TypeExtensions.cs

@@ -37,6 +37,7 @@ internal static class TypeExtensions
         { typeof(DateTimeOffset), DuckDBType.TimestampTz},
         { typeof(BigInteger), DuckDBType.HugeInt},
         { typeof(string), DuckDBType.Varchar},
+        { typeof(byte[]), DuckDBType.Blob},
         { typeof(decimal), DuckDBType.Decimal},
         { typeof(object), DuckDBType.Any},
     };

DuckDB.NET.Data/Mapping/DuckDBAppenderMap.cs

@@ -90,6 +90,7 @@ public IDuckDBAppenderRow AppendToRow(IDuckDBAppenderRow row, T record)
         {
             // Reference types
             string v => row.AppendValue(v),
+            byte[] v => row.AppendValue(v),
 
             // Value types
             bool v => row.AppendValue(v),

DuckDB.NET.Test/DuckDBDataReaderTests.cs

@@ -353,6 +353,35 @@ public void ReadDecimalSchema()
         schemaTable.Rows[0]["NumericPrecision"].Should().Be(10);
     }
 
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void Repro332_SchemaTableAfterNextResult(bool streaming)
+    {
+        Command.CommandText = "SELECT 1 AS a, 2 AS b";
+        Command.UseStreamingMode = streaming;
+        using var reader = Command.ExecuteReader();
+
+        while (reader.Read()) { }
+        reader.NextResult().Should().BeFalse(); // exhausts result set, like DataTable.Load does
+
+        var schemaTable = reader.GetSchemaTable();
+        schemaTable.Rows.Count.Should().Be(2);
+    }
+
+    [Fact]
+    public void Repro332_DataTableLoad()
+    {
+        Command.CommandText = "SELECT 1 AS a, 2 AS b";
+        using var reader = Command.ExecuteReader();
+
+        var table = new DataTable();
+        table.Load(reader); // calls NextResult() internally after reading rows
+
+        var schemaTable = reader.GetSchemaTable();
+        schemaTable.Rows.Count.Should().Be(2);
+    }
+
     [Fact]
     public void ReadDecimalSchemaWithoutTableRow()
     {

DuckDB.NET.Test/DuckDBMappedAppenderTests.cs

@@ -62,6 +62,59 @@ public void MappedAppender_ValidatesTypeMatching()
         reader.GetDateTime(3).Should().Be(new DateTime(1985, 5, 20));
     }
 
+    // Example entity with a binary column
+    public class FileEntry
+    {
+        public int Id { get; set; }
+        public byte[] Data { get; set; } = Array.Empty<byte>();
+    }
+
+    public class FileEntryMap : DuckDBAppenderMap<FileEntry>
+    {
+        public FileEntryMap()
+        {
+            Map(f => f.Id);
+            Map(f => f.Data);
+        }
+    }
+
+    [Fact]
+    public void MappedAppender_SupportsByteArray()
+    {
+        Command.CommandText = "CREATE TABLE file_entry(id INTEGER, data BLOB);";
+        Command.ExecuteNonQuery();
+
+        var entries = new[]
+        {
+            new FileEntry { Id = 1, Data = new byte[] { 1, 2, 3 } },
+            new FileEntry { Id = 2, Data = new byte[] { 10, 20, 30, 40 } },
+        };
+
+        using (var appender = Connection.CreateAppender<FileEntry, FileEntryMap>("file_entry"))
+        {
+            appender.AppendRecords(entries);
+        }
+
+        Command.CommandText = "SELECT id, data FROM file_entry ORDER BY id";
+        using var reader = Command.ExecuteReader();
+
+        reader.Read().Should().BeTrue();
+        reader.GetInt32(0).Should().Be(1);
+        ReadBlob(reader, 1).Should().Equal(1, 2, 3);
+
+        reader.Read().Should().BeTrue();
+        reader.GetInt32(0).Should().Be(2);
+        ReadBlob(reader, 1).Should().Equal(10, 20, 30, 40);
+
+        static byte[] ReadBlob(System.Data.Common.DbDataReader reader, int ordinal)
+        {
+            using var stream = reader.GetStream(ordinal);
+            using var memory = new MemoryStream();
+            stream.CopyTo(memory);
+            return memory.ToArray();
+        }
+    }
+
     // Example with type mismatch - should throw
     public class WrongTypeMap : DuckDBAppenderMap<Person>
     {