Use the new SQLite3::Database#busy_handler_timeout= method for a non-GVL-blocking, fair retry interval busy handler implementation

Author: fractaledmind

Gemfile

@@ -155,7 +155,7 @@ platforms :ruby, :windows do
   gem "racc", ">=1.4.6", require: false
 
   # Active Record.
-  gem "sqlite3", ">= 1.6.6"
+  gem "sqlite3", ">= 2.0"
 
   group :db do
     gem "pg", "~> 1.3"

Gemfile.lock

@@ -682,7 +682,7 @@ DEPENDENCIES
   sidekiq
   sneakers
   sprockets-rails (>= 2.0.0)
-  sqlite3 (>= 1.6.6)
+  sqlite3 (>= 2.0)
   stackprof
   stimulus-rails
   sucker_punch

activerecord/CHANGELOG.md

@@ -1,3 +1,9 @@
+*   Replace `SQLite3::Database#busy_timeout` with `#busy_handler_timeout=`
+
+    Provides a non-GVL-blocking, fair retry interval busy handler implementation
+
+    *Stephen Margheim*
+
 *   Add `ActiveRecord::Relation#readonly?`.
 
     Reflects if the relation has been marked as readonly.

activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

@@ -759,15 +759,8 @@ def reconnect
         end
 
         def configure_connection
-          if @config[:timeout] && @config[:retries]
-            raise ArgumentError, "Cannot specify both timeout and retries arguments"
-          elsif @config[:timeout]
-            @raw_connection.busy_timeout(self.class.type_cast_config_to_integer(@config[:timeout]))
-          elsif @config[:retries]
-            retries = self.class.type_cast_config_to_integer(@config[:retries])
-            raw_connection.busy_handler do |count|
-              count <= retries
-            end
+          if @config[:timeout]
+            @raw_connection.busy_handler_timeout = self.class.type_cast_config_to_integer(@config[:timeout]))
           end
 
           super

guides/bug_report_templates/action_mailbox.rb

@@ -9,7 +9,7 @@
   # If you want to test against edge Rails replace the previous line with this:
   # gem "rails", github: "rails/rails", branch: "main"
 
-  gem "sqlite3", "~> 1.4"
+  gem "sqlite3", ">= 2.0"
 end
 
 require "active_record/railtie"

guides/bug_report_templates/active_record.rb

@@ -9,7 +9,7 @@
   # If you want to test against edge Rails replace the previous line with this:
   # gem "rails", github: "rails/rails", branch: "main"
 
-  gem "sqlite3", "~> 1.4"
+  gem "sqlite3", ">= 2.0"
 end
 
 require "active_record"

guides/bug_report_templates/active_record_migrations.rb

@@ -9,7 +9,7 @@
   # If you want to test against edge Rails replace the previous line with this:
   # gem "rails", github: "rails/rails", branch: "main"
 
-  gem "sqlite3", "~> 1.4"
+  gem "sqlite3", ">= 2.0"
 end
 
 require "active_record"

guides/bug_report_templates/active_storage.rb

@@ -9,7 +9,7 @@
   # If you want to test against edge Rails replace the previous line with this:
   # gem "rails", github: "rails/rails", branch: "main"
 
-  gem "sqlite3", "~> 1.4"
+  gem "sqlite3", ">= 2.0"
 end
 
 require "active_record/railtie"

railties/lib/rails/generators/database.rb

@@ -223,7 +223,7 @@ def port
         end
 
         def gem
-          ["sqlite3", [">= 1.4"]]
+          ["sqlite3", [">= 2.0"]]
         end
 
         def base_package

railties/test/generators/app_generator_test.rb

@@ -472,7 +472,7 @@ def test_gemfile_has_no_whitespace_errors
   def test_config_database_is_added_by_default
     run_generator
     assert_file "config/database.yml", /sqlite3/
-    assert_gem "sqlite3", '">= 1.4"'
+    assert_gem "sqlite3", '">= 2.0"'
   end
 
   def test_config_mysql_database