make sure we set enable_load_extension back to false

Author: flavorjones

lib/sqlite3/database.rb

@@ -66,12 +66,13 @@ module SQLite3
   #   db.load_extension(SQLean::Crypto)
   #
   # It's also possible in v2.4.0+ to load extensions via the SQLite3::Database constructor by using
-  # the +extensions:+ keyword argument to pass an array of strings or extension specifiers:
+  # the +extensions:+ keyword argument to pass an array of String paths or extension specifiers:
   #
   #   db = SQLite3::Database.new(":memory:", extensions: ["/path/to/extension", SQLean::Crypto])
   #
-  # Note that the constructor will implicitly call #enable_load_extension if the +extensions:+
-  # keyword argument is present.
+  # Note that when loading extensions via the constructor, there is no need to call
+  # #enable_load_extension; however it is still necessary to call #enable_load_extensions before any
+  # subsequently invocations of #load_extension on the initialized Database object.
   #
   class Database
     attr_reader :collations
@@ -729,10 +730,14 @@ def initialize_extensions(extensions) # :nodoc:
       raise TypeError, "extensions must be an Array" unless extensions.is_a?(Array)
       return if extensions.empty?
 
-      enable_load_extension(true)
+      begin
+        enable_load_extension(true)
 
-      extensions.each do |extension|
-        load_extension(extension)
+        extensions.each do |extension|
+          load_extension(extension)
+        end
+      ensure
+        enable_load_extension(false)
       end
     end
 

test/test_database.rb

@@ -701,25 +701,36 @@ def test_initialize_extensions_with_extensions_calls_enable_load_extension
       mock_database_load_extension_internal(db)
       class << db
         attr_accessor :enable_load_extension_called
+        attr_reader :enable_load_extension_arg
 
-        def enable_load_extension(...)
-          @enable_load_extension_called = true
+        def reset_test
+          @enable_load_extension_called = 0
+          @enable_load_extension_arg = []
+        end
+
+        def enable_load_extension(val)
+          @enable_load_extension_called += 1
+          @enable_load_extension_arg << val
         end
       end
 
+      db.reset_test
       db.initialize_extensions(nil)
-      refute(db.enable_load_extension_called)
+      assert_equal(0, db.enable_load_extension_called)
 
+      db.reset_test
       db.initialize_extensions([])
-      refute(db.enable_load_extension_called)
+      assert_equal(0, db.enable_load_extension_called)
 
+      db.reset_test
       db.initialize_extensions(["/path/to/extension"])
-      assert(db.enable_load_extension_called)
-
-      db.enable_load_extension_called = false # reset
+      assert_equal(2, db.enable_load_extension_called)
+      assert_equal([true, false], db.enable_load_extension_arg)
 
+      db.reset_test
       db.initialize_extensions([FakeExtensionSpecifier])
-      assert(db.enable_load_extension_called)
+      assert_equal(2, db.enable_load_extension_called)
+      assert_equal([true, false], db.enable_load_extension_arg)
     end
 
     def test_initialize_extensions_object_is_an_extension_specifier