Avoid using SQLite types in type signatures

src/Workspaces/Core/Portable/Storage/SQLite/Interop/SafeSqliteBlobHandle.cs

@@ -5,20 +5,34 @@
 #nullable enable
 
 using System;
+using System.Runtime.InteropServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 using SQLitePCL;
 
 namespace Microsoft.CodeAnalysis.SQLite.Interop
 {
-    internal sealed class SafeSqliteBlobHandle : SafeSqliteChildHandle<sqlite3_blob>
+    internal sealed class SafeSqliteBlobHandle : SafeHandle
     {
+        private readonly sqlite3_blob? _wrapper;
+        private readonly SafeHandleLease _lease;
+
         public SafeSqliteBlobHandle(SafeSqliteHandle sqliteHandle, sqlite3_blob? wrapper)
-            : base(sqliteHandle, wrapper?.ptr ?? IntPtr.Zero, wrapper)
+            : base(invalidHandleValue: IntPtr.Zero, ownsHandle: true)
         {
+            _wrapper = wrapper;
+            SetHandle(wrapper?.ptr ?? IntPtr.Zero);
+            _lease = sqliteHandle.Lease();
         }
 
-        protected override bool ReleaseChildHandle()
+        public override bool IsInvalid => handle == IntPtr.Zero;
+
+        public new sqlite3_blob DangerousGetHandle()
+            => _wrapper!;
+
+        protected override bool ReleaseHandle()
         {
-            var result = (Result)raw.sqlite3_blob_close(Wrapper);
+            using var _ = _lease;
+            var result = (Result)raw.sqlite3_blob_close(_wrapper);
             return result == Result.OK;
         }
     }

src/Workspaces/Core/Portable/Storage/SQLite/Interop/SafeSqliteHandle.cs

@@ -5,20 +5,30 @@
 #nullable enable
 
 using System;
+using System.Runtime.InteropServices;
 using SQLitePCL;
 
 namespace Microsoft.CodeAnalysis.SQLite.Interop
 {
-    internal sealed class SafeSqliteHandle : SafeSqliteHandle<sqlite3>
+    internal sealed class SafeSqliteHandle : SafeHandle
     {
+        private readonly sqlite3? _wrapper;
+
         public SafeSqliteHandle(sqlite3? wrapper)
-            : base(wrapper?.ptr ?? IntPtr.Zero, wrapper)
+            : base(invalidHandleValue: IntPtr.Zero, ownsHandle: true)
         {
+            _wrapper = wrapper;
+            SetHandle(wrapper?.ptr ?? IntPtr.Zero);
         }
 
+        public override bool IsInvalid => handle == IntPtr.Zero;
+
+        public new sqlite3 DangerousGetHandle()
+            => _wrapper!;
+
         protected override bool ReleaseHandle()
         {
-            var result = (Result)raw.sqlite3_close(Wrapper);
+            var result = (Result)raw.sqlite3_close(_wrapper);
             return result == Result.OK;
         }
     }

src/Workspaces/Core/Portable/Storage/SQLite/Interop/SafeSqliteStatementHandle.cs

@@ -5,20 +5,34 @@
 #nullable enable
 
 using System;
+using System.Runtime.InteropServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 using SQLitePCL;
 
 namespace Microsoft.CodeAnalysis.SQLite.Interop
 {
-    internal sealed class SafeSqliteStatementHandle : SafeSqliteChildHandle<sqlite3_stmt>
+    internal sealed class SafeSqliteStatementHandle : SafeHandle
     {
+        private readonly sqlite3_stmt? _wrapper;
+        private readonly SafeHandleLease _lease;
+
         public SafeSqliteStatementHandle(SafeSqliteHandle sqliteHandle, sqlite3_stmt? wrapper)
-            : base(sqliteHandle, wrapper?.ptr ?? IntPtr.Zero, wrapper)
+            : base(invalidHandleValue: IntPtr.Zero, ownsHandle: true)
         {
+            _wrapper = wrapper;
+            SetHandle(wrapper?.ptr ?? IntPtr.Zero);
+            _lease = sqliteHandle.Lease();
         }
 
-        protected override bool ReleaseChildHandle()
+        public override bool IsInvalid => handle == IntPtr.Zero;
+
+        public new sqlite3_stmt DangerousGetHandle()
+            => _wrapper!;
+
+        protected override bool ReleaseHandle()
         {
-            var result = (Result)raw.sqlite3_finalize(Wrapper);
+            using var _ = _lease;
+            var result = (Result)raw.sqlite3_finalize(_wrapper);
             return result == Result.OK;
         }
     }