Merge branch 'develop' into nightly-builds

Author: Giorgi

DuckDB.NET.Data/DuckDBConnectionStringBuilder.cs

@@ -19,6 +19,7 @@ public class DuckDBConnectionStringBuilder : DbConnectionStringBuilder
     public const string InMemorySharedConnectionString = "DataSource=:memory:?cache=shared";
 
     private const string DataSourceKey = "DataSource";
+    private const string DuckDBApiConfigKey = "duckdb_api";
 
     static DuckDBConnectionStringBuilder()
     {
@@ -38,6 +39,11 @@ internal static DuckDBConnectionString Parse(string connectionString)
             ConnectionString = connectionString
         };
 
+        if (!builder.ContainsKey(DuckDBApiConfigKey))
+        {
+            builder[DuckDBApiConfigKey] = "DuckDB.NET";
+        }
+
         var dataSource = builder.DataSource;
 
         var configurations = new Dictionary<string, string>();

DuckDB.NET.Data/DuckDBDataReader.cs

@@ -64,48 +64,45 @@ private bool InitNextReader()
 
     private bool InitChunkData()
     {
-        unsafe
+        foreach (var reader in vectorReaders)
         {
-            foreach (var reader in vectorReaders)
-            {
-                reader.Dispose();
-            }
+            reader.Dispose();
+        }
 
-            currentChunk?.Dispose();
-            currentChunk = streamingResult ? NativeMethods.StreamingResult.DuckDBStreamFetchChunk(currentResult) : NativeMethods.Types.DuckDBResultGetChunk(currentResult, currentChunkIndex);
+        currentChunk?.Dispose();
+        currentChunk = streamingResult ? NativeMethods.StreamingResult.DuckDBStreamFetchChunk(currentResult) : NativeMethods.Types.DuckDBResultGetChunk(currentResult, currentChunkIndex);
 
-            rowsReadFromCurrentChunk = 0;
+        rowsReadFromCurrentChunk = 0;
 
-            currentChunkRowCount = NativeMethods.DataChunks.DuckDBDataChunkGetSize(currentChunk);
+        currentChunkRowCount = NativeMethods.DataChunks.DuckDBDataChunkGetSize(currentChunk);
 
-            if (vectorReaders.Length != fieldCount)
-            {
-                vectorReaders = new VectorDataReaderBase[fieldCount];
-            }
+        if (vectorReaders.Length != fieldCount)
+        {
+            vectorReaders = new VectorDataReaderBase[fieldCount];
+        }
 
-            for (int index = 0; index < fieldCount; index++)
-            {
-                var vector = NativeMethods.DataChunks.DuckDBDataChunkGetVector(currentChunk, index);
+        for (int index = 0; index < fieldCount; index++)
+        {
+            var vector = NativeMethods.DataChunks.DuckDBDataChunkGetVector(currentChunk, index);
 
-                using var logicalType = NativeMethods.Query.DuckDBColumnLogicalType(ref currentResult, index);
+            using var logicalType = NativeMethods.Query.DuckDBColumnLogicalType(ref currentResult, index);
 
-                vectorReaders[index] = VectorDataReaderFactory.CreateReader(vector, logicalType, vectorReaders[index]?.ColumnName ??
-                                                                            NativeMethods.Query.DuckDBColumnName(ref currentResult, index).ToManagedString(false));
-            }
+            var columnName = vectorReaders[index]?.ColumnName ?? NativeMethods.Query.DuckDBColumnName(ref currentResult, index).ToManagedString(false);
+            vectorReaders[index] = VectorDataReaderFactory.CreateReader(vector, logicalType, columnName);
+        }
 
-            if (columnMapping.Count == 0)
+        if (columnMapping.Count == 0)
+        {
+            for (var i = 0; i < vectorReaders.Length; i++)
             {
-                for (var i = 0; i < vectorReaders.Length; i++)
+                if (!columnMapping.ContainsKey(vectorReaders[i].ColumnName))
                 {
-                    if (!columnMapping.ContainsKey(vectorReaders[i].ColumnName))
-                    {
-                        columnMapping.Add(vectorReaders[i].ColumnName, i);
-                    }
+                    columnMapping.Add(vectorReaders[i].ColumnName, i);
                 }
             }
-
-            return currentChunkRowCount > 0;
         }
+
+        return currentChunkRowCount > 0;
     }
 
     public override bool GetBoolean(int ordinal)

DuckDB.NET.Data/DuckDBDbType.cs

@@ -1,6 +1 @@
 namespace DuckDB.NET.Data;
-
-public enum DuckDBDbType
-{
-    List
-}

DuckDB.NET.Data/DuckDBParameter.cs

@@ -14,8 +14,6 @@ public class DuckDBParameter : DbParameter
 
     public override DbType DbType { get; set; }
 
-    public DuckDBDbType DuckDBType { get; set; }
-
 #if NET6_0_OR_GREATER
     [AllowNull]
 #endif

DuckDB.NET.Test/DuckDBConnectionTests.cs

@@ -536,4 +536,17 @@ void Assert(object sender, StateChangeEventArgs args)
             handlerCalled = true;
         }
     }
+
+    [Fact]
+    public void ConnectionSetsDuckDBApiConfigOption()
+    {
+        using (var connection = new DuckDBConnection(DuckDBConnectionStringBuilder.InMemoryConnectionString))
+        {
+            connection.Open();
+            using var command = connection.CreateCommand();
+            command.CommandText = "SELECT current_setting('duckdb_api');";
+            var value = command.ExecuteScalar();
+            value.Should().Be("DuckDB.NET");
+        }
+    }
 }