Merge 9b924f6 into c6cc733

Giorgi · Jun 14, 2024 · 39906ca · 39906ca
2 parents c6cc733 + 9b924f6
commit 39906ca
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 3 deletions.
diff --git a/DuckDB.NET.Bindings/NativeMethods/NativeMethods.Startup.cs b/DuckDB.NET.Bindings/NativeMethods/NativeMethods.Startup.cs
@@ -9,10 +9,30 @@ public partial class NativeMethods
     public static class Startup
     {
         [DllImport(DuckDbLibrary, CallingConvention = CallingConvention.Cdecl, EntryPoint = "duckdb_open")]
-        public static extern DuckDBState DuckDBOpen(string? path, out DuckDBDatabase database);
+        public static extern DuckDBState DuckDBOpenNative(SafeUnmanagedMemoryHandle path, out DuckDBDatabase database);
+
+        public static DuckDBState DuckDBOpen(string? path, out DuckDBDatabase database)
+        {
+            if (path == null)
+            {
+                return DuckDBOpenNative(new SafeUnmanagedMemoryHandle(IntPtr.Zero), out database);
+            }
+            using var handle = path.ToUnmanagedString();
+            return DuckDBOpenNative(handle, out database);
+        }
 
         [DllImport(DuckDbLibrary, CallingConvention = CallingConvention.Cdecl, EntryPoint = "duckdb_open_ext")]
-        public static extern DuckDBState DuckDBOpen(string? path, out DuckDBDatabase database, DuckDBConfig config, out IntPtr error);
+        public static extern DuckDBState DuckDBOpenNative(SafeUnmanagedMemoryHandle path, out DuckDBDatabase database, DuckDBConfig config, out IntPtr error);
+
+        public static DuckDBState DuckDBOpen(string? path, out DuckDBDatabase database, DuckDBConfig config, out IntPtr error)
+        {
+            if (path == null)
+            {
+                return DuckDBOpenNative(new SafeUnmanagedMemoryHandle(IntPtr.Zero), out database, config, out error);
+            }
+            using var handle = path.ToUnmanagedString();
+            return DuckDBOpenNative(handle, out database, config, out error);
+        }
 
         [DllImport(DuckDbLibrary, CallingConvention = CallingConvention.Cdecl, EntryPoint = "duckdb_close")]
         public static extern void DuckDBClose(out IntPtr database);

diff --git a/DuckDB.NET.Samples/Program.cs b/DuckDB.NET.Samples/Program.cs
@@ -91,7 +91,7 @@ private static void AdoNetSamples()
 
         private static void LowLevelBindingsSample()
         {
-            var result = Startup.DuckDBOpen(null, out var database);
+            var result = Startup.DuckDBOpenNative(null, out var database);
 
             using (database)
             {

diff --git a/DuckDB.NET.Test/OpenTests.cs b/DuckDB.NET.Test/OpenTests.cs
@@ -0,0 +1,34 @@
+using DuckDB.NET.Data;
+using System.IO;
+using Xunit;
+
+namespace DuckDB.NET.Test;
+
+public class OpenTests
+{
+    [Theory]
+    [InlineData("中文", "中文.db")]
+    [InlineData("english", "english.db")]
+    [InlineData("한국어", "한국어.db")]
+    public void OpenWithFile(string path,string fileName)
+    {
+        var dir = Path.Combine(path);
+        if (!Directory.Exists(dir))
+        {
+            Directory.CreateDirectory(dir);
+        }
+        var file = Path.Combine(dir, fileName);
+        using (var conn=new DuckDBConnection($"Data Source={file}"))
+        {
+            conn.Open();
+        }
+        try
+        {
+            File.Delete(file);
+            Directory.Delete(dir);
+        }
+        catch (System.Exception)
+        {
+        }
+    }
+}