Switched back to the official SQLitePCLRaw.

Author: garthmz

SQLite.Net.Tests/SQLite.Net2.Tests.csproj

@@ -20,7 +20,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.3.1" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.8" />
   </ItemGroup>
 
   <ItemGroup>

SQLite.Net.Tests/SerializeTest.cs

@@ -3,8 +3,6 @@
 using System.Linq;
 using NUnit.Framework;
 
-using System.Threading.Tasks;
-
 namespace SQLite.Net2.Tests
 {
     [TestFixture]
@@ -32,7 +30,7 @@ public SerializeTestDb(String path) : base(path)
         }
 
         [Test]
-        public async Task SerializeRoundTrip()
+        public void SerializeRoundTrip()
         {
             var obj1 = new SerializeTestObj
             {
@@ -41,15 +39,15 @@ public async Task SerializeRoundTrip()
 
             SQLiteConnection srcDb = new SerializeTestDb(":memory:");
 
-            int numIn1 = srcDb.Insert(obj1);
+            var numIn1 = srcDb.Insert(obj1);
             Assert.AreEqual(1, numIn1);
 
             List<SerializeTestObj> result1 = srcDb.Query<SerializeTestObj>("select * from SerializeTestObj").ToList();
             Assert.AreEqual(numIn1, result1.Count);
             Assert.AreEqual(obj1.Text, result1.First().Text);
 
 
-            byte[] serialized = srcDb.Serialize();
+            var serialized = srcDb.Serialize();
             srcDb.Close();
 
             SQLiteConnection destDb = new SerializeTestDb(":memory");

local_nuget_packages/SQLitePCLRaw.bundle_e_sqlite3.2.1.3.1.nupkg

@@ -315,34 +315,63 @@ public bool Equals(IDbBackupHandle other)
 
         #region Serialize
 
-        public byte[] Serialize(IDbHandle db, string schema)
+        /// <summary>
+        /// Serialize the database, passing the memory to the given function to be copied as appropriate.
+        /// <see cref="copy"/> will be called with a pointer to the serialized data and its size, and its
+        /// return value or any exceptions will be passed through.  The serialized memory is only valid
+        /// during the callback, and will be freed immediately after regardless of success or failure.
+        /// </summary>
+        public T Serialize<T>(IDbHandle db, string schema, Func<IntPtr, long, T> copy)
         {
             var internalDbHandle = (DbHandle)db;
-            return raw.sqlite3_serialize(internalDbHandle.DbPtr, schema);
-        }
 
-        public long Serialize(IDbHandle db, string schema, System.IO.Stream stream)
-        {
-            var internalDbHandle = (DbHandle)db;
-            return raw.sqlite3_serialize(internalDbHandle.DbPtr, schema, stream);
-        }
+            var bytesPtr = raw.sqlite3_serialize(internalDbHandle.DbPtr, schema, out var size, 0);
+            if (bytesPtr == IntPtr.Zero)
+            {
+                throw new SQLiteException(Result.NoMem, Errmsg16(internalDbHandle));
+            }
 
-        public void Deserialize(IDbHandle db, string schema, byte[] data)
-        {
-            var internalDbHandle = (DbHandle)db;
-            var r = (Result)raw.sqlite3_deserialize(internalDbHandle.DbPtr, schema, data);
-            if (r != Result.OK)
+            try
             {
-                throw new SQLiteException(r, Errmsg16(internalDbHandle));
+                return copy(bytesPtr, size);
+            }
+            finally
+            {
+                raw.sqlite3_free(bytesPtr);
             }
         }
 
-        public void Deserialize(IDbHandle db, string schema, System.IO.Stream stream)
+        /// <summary>
+        /// Deserialize a database. A buffer of the requested <see cref="size"/> will be allocated and
+        /// passed with the size to the given function to be filled as appropriate. Any exceptions will
+        /// be passed through. The buffer is only valid during the callback, and will be freed or passed
+        /// to sqlite immediately after depending on success.
+        /// </summary>
+        public void Deserialize(IDbHandle db, string schema, long size, Action<IntPtr, long> copy)
         {
             var internalDbHandle = (DbHandle)db;
-            var r = (Result)raw.sqlite3_deserialize(internalDbHandle.DbPtr, schema, stream);
+
+            var bytesPtr = raw.sqlite3_malloc64(size);
+            if (bytesPtr == IntPtr.Zero)
+            {
+                throw new SQLiteException(Result.NoMem, Errmsg16(internalDbHandle));
+            }
+
+            try
+            {
+                copy(bytesPtr, size);
+            }
+            catch
+            {
+                raw.sqlite3_free(bytesPtr);
+                throw;
+            }
+
+            const int flags = raw.SQLITE_DESERIALIZE_RESIZEABLE | raw.SQLITE_DESERIALIZE_FREEONCLOSE;
+            var r = (Result)raw.sqlite3_deserialize(internalDbHandle.DbPtr, schema, bytesPtr, size, size, flags);
             if (r != Result.OK)
             {
+                // note: sqlite will free the buffer on error, thanks to SQLITE_DESERIALIZE_FREEONCLOSE
                 throw new SQLiteException(r, Errmsg16(internalDbHandle));
             }
         }
@@ -380,4 +409,4 @@ public bool Equals(IDbStatement other)
             }
         }
     }
-}
+}

local_nuget_packages/SQLitePCLRaw.core.2.1.3.1.nupkg

@@ -10,6 +10,7 @@
     <AssemblyCopyright>Copyright ©2022 Benjamin Mayrargue</AssemblyCopyright>
     <LangVersion>Latest</LangVersion>
     <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <!--  nuget configurable properties -->
@@ -31,7 +32,7 @@
     <Title>sqlite-net2 light ORM for SQLite</Title>
     <Description>sqlite-net2 allows applications to manage data in SQLite databases using Entity Framework like queries, but much lighter</Description>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <VersionSuffix>.7</VersionSuffix>
+    <VersionSuffix>.8</VersionSuffix>
     <PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
     <Authors>Benjamin Mayrargue</Authors>
     <Owners>Benjamin Mayrargue</Owners>
@@ -47,7 +48,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SQLitePCLRaw.core" Version="2.1.3.1" />
+    <PackageReference Include="SQLitePCLRaw.core" Version="2.1.8" />
     <None Include="..\..\LICENSE.md" Pack="true" PackagePath="" />
   </ItemGroup>
 

local_nuget_packages/SQLitePCLRaw.lib.e_sqlite3.2.1.3.1.nupkg

@@ -23,6 +23,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -1806,24 +1807,63 @@ public async Task<string> CreateDatabaseBackup()
 
         #region Serialize
 
+        /// <summary>
+        /// Get the serialization of the database.
+        /// (This is the same sequence of bytes as would be written to a .db file.)
+        /// </summary>
         public byte[] Serialize(string databaseName = "main")
         {
-            return sqlite.Serialize(Handle, databaseName);
+            return sqlite.Serialize(Handle, databaseName, (bytesPtr, size) =>
+            {
+                unsafe
+                {
+                    return new ReadOnlySpan<byte>(bytesPtr.ToPointer(), checked((int)size)).ToArray();
+                }
+            });
         }
 
-        public long Serialize(System.IO.Stream stream, string databaseName = "main")
+        /// <summary>
+        /// Write the serialization of the database to the given stream.
+        /// (This is the same sequence of bytes as would be written to a .db file.)
+        /// </summary>
+        public long Serialize(Stream stream, string databaseName = "main")
         {
-            return sqlite.Serialize(Handle, databaseName, stream);
+            return sqlite.Serialize(Handle, databaseName, (bytesPtr, size) =>
+            {
+                unsafe
+                {
+                    new UnmanagedMemoryStream((byte*)bytesPtr, size).CopyTo(stream);
+                }
+                return size;
+            });
         }
 
+        /// <summary>
+        /// Load the serialization (.db file contents) of a database from the given byte array.
+        /// </summary>
         public void Deserialize(byte[] dbData, string databaseName = "main")
         {
-            sqlite.Deserialize(Handle, databaseName, dbData);
+            sqlite.Deserialize(Handle, databaseName, dbData.Length, (bytesPtr, size) =>
+            {
+                unsafe
+                {
+                    dbData.CopyTo(new Span<byte>(bytesPtr.ToPointer(), checked((int)size)));
+                }
+            });
         }
 
-        public void Deserialize(System.IO.Stream stream, string databaseName = "main")
+        /// <summary>
+        /// Load the serialization (.db file contents) of a database from the given stream.
+        /// </summary>
+        public void Deserialize(Stream stream, string databaseName = "main")
         {
-            sqlite.Deserialize(Handle, databaseName, stream);
+            sqlite.Deserialize(Handle, databaseName, stream.Length, (bytesPtr, size) =>
+            {
+                unsafe
+                {
+                    stream.CopyTo(new UnmanagedMemoryStream((byte*)bytesPtr, size, size, FileAccess.Write));
+                }
+            });
         }
 
         #endregion