Pass DuckDBResult as object instead of pointer

Giorgi · Sep 9, 2023 · 10bd1b9 · 10bd1b9
1 parent 612ec53
commit 10bd1b9
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/DuckDB.NET.Bindings/DuckDBNativeObjects.cs b/DuckDB.NET.Bindings/DuckDBNativeObjects.cs
@@ -74,12 +74,45 @@ public class DuckDBResult : IDisposable
 
         private IntPtr internal_data;
 
+        public DuckDBResultStruct ToStruct()
+        {
+            return new DuckDBResultStruct()
+            {
+                ColumnCount = ColumnCount,
+                RowCount = RowCount,
+                RowsChanged = RowsChanged,
+                columns = columns,
+                ErrorMessage = ErrorMessage,
+                internal_data = internal_data
+            };
+        }
+
         public void Dispose()
         {
             NativeMethods.Query.DuckDBDestroyResult(this);
         }
     }
 
+    public struct DuckDBResultStruct
+    {
+        [Obsolete]
+        internal long ColumnCount;
+
+        [Obsolete]
+        internal long RowCount;
+
+        [Obsolete]
+        internal long RowsChanged;
+
+        [Obsolete]
+        internal IntPtr columns;
+
+        [Obsolete]
+        internal IntPtr ErrorMessage;
+
+        internal IntPtr internal_data;
+    }
+
     [StructLayout(LayoutKind.Sequential)]
     public struct DuckDBDate
     {

diff --git a/DuckDB.NET.Bindings/NativeMethods.cs b/DuckDB.NET.Bindings/NativeMethods.cs
@@ -189,10 +189,10 @@ public static class Types
             public static extern DuckDBTimestampStruct DuckDBValueTimestamp([In, Out] DuckDBResult result, long col, long row);
 
             [DllImport(DuckDbLibrary, CallingConvention = CallingConvention.Cdecl, EntryPoint = "duckdb_result_get_chunk")]
-            public static extern IntPtr DuckDBResultGetChunk([In, Out] DuckDBResult result, long chunkIndex);
+            public static extern IntPtr DuckDBResultGetChunk([In, Out] DuckDBResultStruct result, long chunkIndex);
 
             [DllImport(DuckDbLibrary, CallingConvention = CallingConvention.Cdecl, EntryPoint = "duckdb_result_chunk_count")]
-            public static extern long DuckDBResultChunkCount([In, Out] DuckDBResult result);
+            public static extern long DuckDBResultChunkCount([In, Out] DuckDBResultStruct result);
         }
 
         public static class PreparedStatements

diff --git a/DuckDB.NET.Data/DuckDBDataReader.cs b/DuckDB.NET.Data/DuckDBDataReader.cs
@@ -40,8 +40,8 @@ internal DuckDBDataReader(DuckDbCommand command, List<DuckDBResult> queryResults
 
         private void InitReaderData()
         {
-            var chunkCount = NativeMethods.Types.DuckDBResultChunkCount(currentResult);
-            var chunk = NativeMethods.Types.DuckDBResultGetChunk(currentResult, 0);
+            var chunkCount = NativeMethods.Types.DuckDBResultChunkCount(currentResult.ToStruct());
+            var chunk = NativeMethods.Types.DuckDBResultGetChunk(currentResult.ToStruct(), 0);
 
             var columnCount = NativeMethods.DataChunks.DuckDBDataChunkGetColumnCount(chunk);