Microsoft.Data.Sqlite: Use sqlite3_load_extension

Fixes #26220
dotnet · Aug 26, 2022 · 7b3c2e5 · 7b3c2e5
1 parent ee33069
commit 7b3c2e5
Showing 1 changed file with 6 additions and 25 deletions.
diff --git a/src/Microsoft.Data.Sqlite.Core/SqliteConnection.cs b/src/Microsoft.Data.Sqlite.Core/SqliteConnection.cs
@@ -298,21 +298,19 @@ public override void Open()
                     }
                 }
 
-                var extensionsEnabledForLoad = false;
                 if (_extensions != null
                     && _extensions.Count != 0)
                 {
-                    rc = sqlite3_enable_load_extension(Handle, 1);
+                    rc = sqlite3_db_config(Handle, SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION, 1, out _);
                     SqliteException.ThrowExceptionForRC(rc, Handle);
-                    extensionsEnabledForLoad = true;
 
                     foreach (var item in _extensions)
                     {
                         LoadExtensionCore(item.file, item.proc);
                     }
                 }
 
-                if (_extensionsEnabled != extensionsEnabledForLoad)
+                if (_extensionsEnabled)
                 {
                     rc = sqlite3_enable_load_extension(Handle, _extensionsEnabled ? 1 : 0);
                     SqliteException.ThrowExceptionForRC(rc, Handle);
@@ -616,21 +614,13 @@ public virtual void LoadExtension(string file, string? proc = null)
             {
                 int rc;
 
-                var extensionsEnabledForLoad = false;
                 if (!_extensionsEnabled)
                 {
-                    rc = sqlite3_enable_load_extension(Handle, 1);
+                    rc = sqlite3_db_config(Handle, SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION, 1, out _);
                     SqliteException.ThrowExceptionForRC(rc, Handle);
-                    extensionsEnabledForLoad = true;
                 }
 
                 LoadExtensionCore(file, proc);
-
-                if (extensionsEnabledForLoad)
-                {
-                    rc = sqlite3_enable_load_extension(Handle, 0);
-                    SqliteException.ThrowExceptionForRC(rc, Handle);
-                }
             }
 
             _extensions ??= new HashSet<(string, string?)>();
@@ -639,19 +629,10 @@ public virtual void LoadExtension(string file, string? proc = null)
 
         private void LoadExtensionCore(string file, string? proc)
         {
-            if (proc == null)
-            {
-                // NB: SQLitePCL.raw doesn't expose sqlite3_load_extension()
-                this.ExecuteNonQuery(
-                    "SELECT load_extension($file);",
-                    new SqliteParameter("$file", file));
-            }
-            else
+            var rc = sqlite3_load_extension(Handle, utf8z.FromString(file), utf8z.FromString(proc), out var errmsg);
+            if (rc != SQLITE_OK)
             {
-                this.ExecuteNonQuery(
-                    "SELECT load_extension($file, $proc);",
-                    new SqliteParameter("$file", file),
-                    new SqliteParameter("$proc", proc));
+                throw new SqliteException(Resources.SqliteNativeError(rc, errmsg.utf8_to_string()), rc, rc);
             }
         }