fibered_mysql2 0.3.1 → 1.0.0.colin.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf06a5be94da99bc7d1e0de4b5268ff04a72fd7671e6c4d522186d1ea67dd0b
-  data.tar.gz: 931890052763e7fcf2f1ffb7925848004dc54c4c583f89d24c258cbe1537a67a
+  metadata.gz: 75d1eaf3701caa8823cdfbec61e7d9734d1e5f463e7936010c5636715591c2c9
+  data.tar.gz: 715db9f2e07df69a6cf51a2389404f030cd9c257524544cb77c16f53de36b944
 SHA512:
-  metadata.gz: 42cab06e4e9bccd07df1436db08c8fb0e8038027690bc03cc58a34eab99ecfd6cccedbdde27f63f9607ce391bea3de8d941cc720775deb7c0c7d65134f405bae
-  data.tar.gz: be4a1bd1357e9d51e2e76e48f93ede62f8b7c3cb9cf515a042cf9d10f4d2afe63721349f5afe65a67d2cc9246741aab39a80c7aa903bafde77d95d75c026cd05
+  metadata.gz: 9a21b639b0b0ab6afcb558978a7e1060510e7fc7ca5e9a833b27d2b8c9eb49d023ac5beb5e0c500c3a3ff711d7f6ee0e49ae61f4e72f941c7a07420f60b9c866
+  data.tar.gz: 99adce5422229bdea37a08ed76a4dad71c6f4108ce3588d42dadc3b6c6fbb2895f65532842739dbe83cd7d6c748ea4b0cf7d57d05ca8fc26cbd0c6e65ab17e41

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Invoca/octothorpe

data/.github/workflows/build.yml

@@ -8,11 +8,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.1, 3.2, 3.3]
+        ruby: [2.5, 2.6, 2.7, '3.0', 3.1]
         gemfile:
         - Gemfile
-        - gemfiles/rails_6_1.gemfile
-        - gemfiles/rails_7_0.gemfile
+        - gemfiles/rails_5.gemfile
+        - gemfiles/rails_6.gemfile
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:

data/.ruby-version

@@ -1 +1 @@
-3.1.6
+3.2.1

data/Appraisals

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
-require "appraisal/matrix"
+appraise 'rails-5' do
+  gem 'rails', '~> 5.2'
+end
 
-appraisal_matrix(rails: [">= 6.1", "< 7.1"])
+appraise 'rails-6' do
+  gem 'rails', '~> 6.0.0'
+end

data/CHANGELOG.md

@@ -4,25 +4,6 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.3.1] - 2024-10-30
-### Fixed
-- Fixed bug in FiberedMysqlAdapter.new_client that was causing `uninitialized constant` errors.
-
-## [0.3.0] - 2024-10-23
-### Added
-- Support for Rails 7.0.
-
-### Removed
-- Removed support for Rails 6.0 and Rails 5.
-
-### Changed
-- Clean up FiberedMysql2ConnectionFactory#fibered_mysql2_connection to better match Mysql2Adapter behavior.
-- Change FiberedMysql2::FiberedDatabaseConnectionPool#initialize to match ActiveRecord::ConnectionAdapters::ConnectionPool#initialize arguments.
-
-## [0.2.1] - 2024-08-19
-### Fixed
-- Fixed bugs in Rails 6.1
-
 ## [0.2.0] - 2023-01-12
 ### Added
 - Added support for Rails 6+ by adding knowledge of lazy transactions to the adapter.

data/Gemfile

@@ -6,11 +6,11 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem 'appraisal'
-gem 'appraisal-matrix'
 gem 'coveralls', require: false
 gem 'mysql2',     '~> 0.5'
-gem 'nokogiri'
-gem 'pry'
-gem 'pry-byebug'
-gem 'rake'
-gem 'rspec'
+gem 'nokogiri',   '< 1.13'
+gem 'pry',        '~> 0.13'
+gem 'pry-byebug', '~> 3.9'
+gem 'rails',      '< 6.1'
+gem 'rake',       '~> 13.0'
+gem 'rspec',      '~> 3.0'

data/Gemfile.lock

@@ -1,89 +1,82 @@
 PATH
   remote: .
   specs:
-    fibered_mysql2 (0.3.1)
-      em-synchrony (~> 1.0)
-      rails (>= 6.1, < 7.1)
+    fibered_mysql2 (1.0.0.colin.1)
+      async
+      rails (>= 5.2, < 7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.8.6)
-      actionpack (= 7.0.8.6)
-      activesupport (= 7.0.8.6)
+    actioncable (6.0.3.4)
+      actionpack (= 6.0.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8.6)
-      actionpack (= 7.0.8.6)
-      activejob (= 7.0.8.6)
-      activerecord (= 7.0.8.6)
-      activestorage (= 7.0.8.6)
-      activesupport (= 7.0.8.6)
+    actionmailbox (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.8.6)
-      actionpack (= 7.0.8.6)
-      actionview (= 7.0.8.6)
-      activejob (= 7.0.8.6)
-      activesupport (= 7.0.8.6)
+    actionmailer (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
       mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.8.6)
-      actionview (= 7.0.8.6)
-      activesupport (= 7.0.8.6)
-      rack (~> 2.0, >= 2.2.4)
+    actionpack (6.0.3.4)
+      actionview (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8.6)
-      actionpack (= 7.0.8.6)
-      activerecord (= 7.0.8.6)
-      activestorage (= 7.0.8.6)
-      activesupport (= 7.0.8.6)
-      globalid (>= 0.6.0)
+    actiontext (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8.6)
-      activesupport (= 7.0.8.6)
+    actionview (6.0.3.4)
+      activesupport (= 6.0.3.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.8.6)
-      activesupport (= 7.0.8.6)
+    activejob (6.0.3.4)
+      activesupport (= 6.0.3.4)
       globalid (>= 0.3.6)
-    activemodel (7.0.8.6)
-      activesupport (= 7.0.8.6)
-    activerecord (7.0.8.6)
-      activemodel (= 7.0.8.6)
-      activesupport (= 7.0.8.6)
-    activestorage (7.0.8.6)
-      actionpack (= 7.0.8.6)
-      activejob (= 7.0.8.6)
-      activerecord (= 7.0.8.6)
-      activesupport (= 7.0.8.6)
-      marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.8.6)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activestorage (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      marcel (~> 0.3.1)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    appraisal (2.5.0)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    appraisal (2.4.0)
       bundler
       rake
       thor (>= 0.14.0)
-    appraisal-matrix (0.3.0)
-      appraisal (~> 2.2)
-    bigdecimal (3.1.8)
-    builder (3.3.0)
+    async (2.5.1)
+      console (~> 1.10)
+      io-event (~> 1.1)
+      timers (~> 4.1)
+    builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.1.8)
+    console (1.16.2)
+      fiber-local
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -91,131 +84,126 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    date (3.3.4)
-    diff-lcs (1.5.1)
-    docile (1.4.1)
-    em-synchrony (1.0.6)
-      eventmachine (>= 1.0.0.beta.1)
-    erubi (1.13.0)
-    eventmachine (1.2.7)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    i18n (1.14.6)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    erubi (1.10.0)
+    fiber-local (1.0.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    loofah (2.23.1)
+    io-event (1.2.2)
+    json (2.3.1)
+    loofah (2.8.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.8.1)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    method_source (1.1.0)
-    mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
-    mysql2 (0.5.6)
-    net-imap (0.5.0)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.0)
-      net-protocol
-    nio4r (2.7.4)
-    nokogiri (1.16.7)
-      mini_portile2 (~> 2.8.2)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (1.0.0)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
+    mini_mime (1.0.2)
+    mini_portile2 (2.6.1)
+    minitest (5.14.3)
+    mysql2 (0.5.5)
+    nio4r (2.5.4)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    pry (0.14.2)
+    pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.1)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
-    racc (1.8.1)
-    rack (2.2.10)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rails (7.0.8.6)
-      actioncable (= 7.0.8.6)
-      actionmailbox (= 7.0.8.6)
-      actionmailer (= 7.0.8.6)
-      actionpack (= 7.0.8.6)
-      actiontext (= 7.0.8.6)
-      actionview (= 7.0.8.6)
-      activejob (= 7.0.8.6)
-      activemodel (= 7.0.8.6)
-      activerecord (= 7.0.8.6)
-      activestorage (= 7.0.8.6)
-      activesupport (= 7.0.8.6)
-      bundler (>= 1.15.0)
-      railties (= 7.0.8.6)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
+      pry (~> 0.13.0)
+    racc (1.6.0)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.3.4)
+      actioncable (= 6.0.3.4)
+      actionmailbox (= 6.0.3.4)
+      actionmailer (= 6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actiontext (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      bundler (>= 1.3.0)
+      railties (= 6.0.3.4)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.0.8.6)
-      actionpack (= 7.0.8.6)
-      activesupport (= 7.0.8.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
-    rake (13.2.1)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.6)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sync (0.5.0)
-    term-ansicolor (1.11.2)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (1.3.2)
-    timeout (0.4.1)
-    tins (1.33.0)
-      bigdecimal
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    timers (4.3.5)
+    tins (1.25.0)
       sync
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.6)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.18)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  appraisal-matrix
   coveralls
   fibered_mysql2!
   mysql2 (~> 0.5)
-  nokogiri
-  pry
-  pry-byebug
-  rake
-  rspec
+  nokogiri (< 1.13)
+  pry (~> 0.13)
+  pry-byebug (~> 3.9)
+  rails (< 6.1)
+  rake (~> 13.0)
+  rspec (~> 3.0)
 
 BUNDLED WITH
    2.2.29

data/fibered_mysql2.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'em-synchrony', '~> 1.0'
-  spec.add_dependency 'rails', '>= 6.1', '< 7.1'
+  spec.add_dependency 'async'
+  spec.add_dependency 'rails', '>= 5.2', '< 7'
 end

data/gemfiles/{rails_6_1.gemfile → rails_5.gemfile}

@@ -3,14 +3,13 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "appraisal-matrix"
 gem "coveralls", require: false
 gem "mysql2", "~> 0.5"
-gem "nokogiri"
-gem "pry"
-gem "pry-byebug"
-gem "rake"
-gem "rspec"
-gem "rails", "~> 6.1.0"
+gem "nokogiri", "< 1.13"
+gem "pry", "~> 0.13"
+gem "pry-byebug", "~> 3.9"
+gem "rails", "~> 5.2"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
 
 gemspec path: "../"

data/gemfiles/{rails_7_0.gemfile → rails_6.gemfile}

@@ -3,14 +3,13 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "appraisal-matrix"
 gem "coveralls", require: false
 gem "mysql2", "~> 0.5"
-gem "nokogiri"
-gem "pry"
-gem "pry-byebug"
-gem "rake"
-gem "rspec"
-gem "rails", "~> 7.0.0"
+gem "nokogiri", "< 1.13"
+gem "pry", "~> 0.13"
+gem "pry-byebug", "~> 3.9"
+gem "rails", "~> 6.0.0"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
 
 gemspec path: "../"

data/lib/active_record/connection_adapters/fibered_mysql2_adapter.rb

@@ -1,81 +1,72 @@
 # frozen_string_literal: true
 
-require 'em-synchrony'
 require 'active_model'
 require 'active_record/errors'
 require 'active_record/connection_adapters/mysql2_adapter'
-require 'active_record/connection_adapters/em_mysql2_adapter'
+require_relative '../../fibered_mysql2/async_task'
 
 module FiberedMysql2
-  module FiberedMysql2Adapter_5_2
+  module FiberedMysql2Adapter_6
     def lease
-      if in_use?
-        msg = "Cannot lease connection, ".dup
-        if owner_fiber == Fiber.current
-          msg << "it is already leased by the current fiber."
+      if (ot = owner_task)
+        msg = +"Cannot lease connection; "
+        if ot == (current_task = AsyncTask.current_or_none)
+          msg << "it is already leased by the current Async::Task."
         else
-          msg << "it is already in use by a different fiber: #{owner_fiber}. " \
-                  "Current fiber: #{Fiber.current}."
+          msg << "it is already in use by a different Async::Task: #{ot}. " \
+                  "Current Async::Task: #{current_task}."
         end
         raise ::ActiveRecord::ActiveRecordError, msg
       end
 
-      @owner = Fiber.current
+      @owner = AsyncTask.current_or_none
     end
 
     def expire
-      if in_use?
-        # Because we are actively releasing connections from dead fibers, we only want
-        # to enforce that we're expiring the current fibers connection, iff the owner
+      if (ot = owner_task)
+        # Because we are actively releasing connections from dead tasks, we only want
+        # to enforce that we're expiring the current task's connection, iff the owner
         # of the connection is still alive.
-        if owner_fiber.alive? && owner_fiber != Fiber.current
-          raise ::ActiveRecord::ActiveRecordError, "Cannot expire connection, " \
-            "it is owned by a different fiber: #{owner_fiber}. " \
-            "Current fiber: #{Fiber.current}."
+        if ot.alive? && ot != (current_task = AsyncTask.current_or_none)
+          raise ::ActiveRecord::ActiveRecordError, "Cannot expire connection; " \
+            "it is owned by a different Async::Task: #{ot}. " \
+            "Current Async::Task: #{current_task}."
         end
 
         @idle_since = ::Concurrent.monotonic_time
         @owner = nil
       else
-        raise ::ActiveRecord::ActiveRecordError, "Cannot expire connection, it is not currently leased."
+        raise ::ActiveRecord::ActiveRecordError, "Cannot expire connection; it is not currently leased."
       end
     end
 
     def steal!
-      if in_use?
-        if owner_fiber != Fiber.current
-          pool.send :remove_connection_from_thread_cache, self, owner_fiber
+      if (ot = owner_task)
+        if ot != (current_task = AsyncTask.current_or_none)
+          pool.send :remove_connection_from_thread_cache, self, ot
 
-          @owner = Fiber.current
+          @owner = current_task
         end
       else
-        raise ::ActiveRecord::ActiveRecordError, "Cannot steal connection, it is not currently leased."
+        raise ::ActiveRecord::ActiveRecordError, "Cannot steal connection; it is not currently leased."
       end
     end
 
     private
 
-    def owner_fiber
-      @owner.nil? || @owner.is_a?(Fiber) or
-        raise "@owner must be a Fiber! Found #{@owner.inspect}"
+    def owner_task
+      @owner.nil? || @owner == AsyncTask::NoTaskPlaceholder || @owner.is_a?(Async::Task) or
+        raise "@owner must be an Async::Task or FiberedMysql2::AsyncTask::NoTaskPlaceholder! Found #{@owner.inspect}"
       @owner
     end
   end
 
-  class FiberedMysql2Adapter < ::ActiveRecord::ConnectionAdapters::EMMysql2Adapter
-    include FiberedMysql2Adapter_5_2
-
-    class << self
-      # Copied from Mysql2Adapter, except with the EM Mysql2 client
-      def new_client(config)
-        Mysql2::EM::Client.new(config)
-      rescue Mysql2::Error => error
-        if error.error_number == 1049
-          raise ActiveRecord::NoDatabaseError.new, error.message
-        else
-          raise ActiveRecord::ConnectionNotEstablished, error.message
-        end
-      end
+  class FiberedMysql2Adapter < ::ActiveRecord::ConnectionAdapters::Mysql2Adapter
+    case ::Rails::VERSION::MAJOR
+    when 6
+      include FiberedMysql2Adapter_6
+    else
+      raise ArgumentError, "unexpected Rails version #{Rails::VERSION::MAJOR}"
     end
 
     def initialize(*args)

data/lib/fibered_mysql2/async_task.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module FiberedMysql2
+  module AsyncTask
+    class NoTaskPlaceholder
+      class << self
+        def alive? = true
+      end
+    end
+
+    class << self
+      # Adapted from https://github.com/socketry/async/blob/main/lib/async/task.rb#L236-L238
+      def current_or_none
+        Thread.current[:async_task] || NoTaskPlaceholder
+      end
+    end
+  end
+end

data/lib/fibered_mysql2/fibered_database_connection_pool.rb

@@ -1,225 +1,50 @@
 # frozen_string_literal: true
 
-# This class behaves the same as ActiveRecord's ConnectionPool, but synchronizes with fibers rather than threads.
+# This class behaves the same as ActiveRecord's ConnectionPool, but synchronizes with Async::Task fibers rather than threads.
 
 # Note - trace statements have been commented out.  This is useful trace but we do not want it on by default.
 #        When we have configurable logging we can put this back and have it off by default.
 
-require 'em-synchrony'
-require 'em-synchrony/thread'
-require 'fibered_mysql2/fibered_mutex_with_waiter_priority'
-
-EventMachine::Synchrony::Thread::Mutex.prepend(FiberedMysql2::FiberedMutexWithWaiterPriority)
-
 module FiberedMysql2
-  class FiberedConditionVariable
-    EXCEPTION_NEVER = {Exception => :never}.freeze
-    EXCEPTION_IMMEDIATE = {Exception => :immediate}.freeze
-
-    #
-    # FIXME: This isn't documented in Nutshell.
-    #
-    # Since MonitorMixin.new_cond returns a ConditionVariable, and the example
-    # above calls while_wait and signal, this class should be documented.
-    #
-    class Timeout < Exception; end
-
-    #
-    # Releases the lock held in the associated monitor and waits; reacquires the lock on wakeup.
-    #
-    # If +timeout+ is given, this method returns after +timeout+ seconds passed,
-    # even if no other thread doesn't signal.
-    #
-    def wait(timeout = nil)
-      Thread.handle_interrupt(EXCEPTION_NEVER) do
-        @monitor.__send__(:mon_check_owner)
-        count = @monitor.__send__(:mon_exit_for_cond)
-        begin
-          Thread.handle_interrupt(EXCEPTION_IMMEDIATE) do
-            @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout)
-          end
-          return true
-        ensure
-          @monitor.__send__(:mon_enter_for_cond, count)
-        end
-      end
-    end
-
-    #
-    # Calls wait repeatedly while the given block yields a truthy value.
-    #
-    def wait_while
-      while yield
-        wait
-      end
-    end
-
-    #
-    # Calls wait repeatedly until the given block yields a truthy value.
-    #
-    def wait_until
-      until yield
-        wait
-      end
-    end
-
-    #
-    # Wakes up the first thread in line waiting for this lock.
-    #
-    def signal
-      @monitor.__send__(:mon_check_owner)
-      @cond.signal
-    end
-
-    #
-    # Wakes up all threads waiting for this lock.
-    #
-    def broadcast
-      @monitor.__send__(:mon_check_owner)
-      @cond.broadcast
-    end
-
-    def initialize(monitor)
-      @monitor = monitor
-      @cond = EM::Synchrony::Thread::ConditionVariable.new
-    end
-  end
-
-  # From Ruby's MonitorMixin, with all occurrences of Thread changed to Fiber
-  module FiberedMonitorMixin
-    def self.extend_object(obj)
-      super
-      obj.__send__(:mon_initialize)
-    end
-
-    #
-    # Attempts to enter exclusive section.  Returns +false+ if lock fails.
-    #
-    def mon_try_enter
-      if @mon_owner != Fiber.current
-        @mon_mutex.try_lock or return false
-        @mon_owner = Fiber.current
-        @mon_count = 0
-      end
-      @mon_count += 1
-      true
+  module FiberedDatabaseConnectionPool
+    case ::Rails::VERSION::MAJOR
+    when 6
+    else
+      raise ArgumentError, "unexpected Rails version #{Rails::VERSION::MAJOR}"
     end
 
-    #
-    # Enters exclusive section.
-    #
-    def mon_enter
-      if @mon_owner != Fiber.current
-        @mon_mutex.lock
-        @mon_owner = Fiber.current
-        @mon_count = 0
-      end
-      @mon_count += 1
+    def cached_connections
+      @thread_cached_conns
     end
 
-    #
-    # Leaves exclusive section.
-    #
-    def mon_exit
-      mon_check_owner
-      @mon_count -= 1
-      if @mon_count == 0
-        @mon_owner = nil
-        @mon_mutex.unlock
-      end
+    def current_connection_id
+      connection_cache_key(current_thread)
     end
 
-    #
-    # Enters exclusive section and executes the block.  Leaves the exclusive
-    # section automatically when the block exits.  See example under
-    # +MonitorMixin+.
-    #
-    def mon_synchronize
-      mon_enter
+    def checkout(checkout_timeout = @checkout_timeout)
       begin
-        yield
-      ensure
-        begin
-          mon_exit
-        rescue => ex
-          ActiveRecord::Base.logger.error("Exception occurred while executing mon_exit: #{ex}")
-        end
+        reap_connections
+      rescue => ex
+        ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex.class}: #{ex.message}")
       end
+      super
     end
-    alias synchronize mon_synchronize
-
-    #
-    # Creates a new FiberedConditionVariable associated with the
-    # receiver.
-    #
-    def new_cond
-      FiberedConditionVariable.new(self)
-    end
-
-    # Initializes the FiberedMonitorMixin after being included in a class
-    def mon_initialize
-      @mon_owner = nil
-      @mon_count = 0
-      @mon_mutex = EM::Synchrony::Thread::Mutex.new
-    end
-
-    def mon_check_owner
-      @mon_owner == Fiber.current or raise FiberError, "current fiber not owner"
-    end
-
-    private
-
-    def mon_enter_for_cond(count)
-      @mon_owner = Fiber.current
-      @mon_count = count
-    end
-
-    # returns the old mon_count
-    def mon_exit_for_cond
-      count = @mon_count
-      @mon_owner = nil
-      @mon_count = 0
-      count
-    end
-  end
-
-  module FiberedDatabaseConnectionPool
-    include FiberedMonitorMixin
-
-    module Adapter_5_2
-      def cached_connections
-        @thread_cached_conns
-      end
-
-      def current_connection_id
-        connection_cache_key(current_thread)
-      end
 
-      def checkout(checkout_timeout = @checkout_timeout)
-        begin
-          reap_connections
-        rescue => ex
-          ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
-        end
-        super
-      end
-
-      def release_connection(owner_thread = Fiber.current)
-        if (conn = @thread_cached_conns.delete(connection_cache_key(owner_thread)))
-          checkin(conn)
-        end
+    def release_connection(owner_task = AsyncTask.current_or_none)
+      if (conn = @thread_cached_conns.delete(connection_cache_key(owner_task)))
+        checkin(conn)
       end
     end
-    include Adapter_5_2
 
-    def initialize(pool_config)
-      if pool_config.db_config.reaping_frequency
-        pool_config.db_config.reaping_frequency > 0 and raise "reaping_frequency is not supported (the ActiveRecord Reaper is thread-based)"
-      end
+    def initialize(connection_spec, *args, **keyword_args)
+      connection_spec.config[:reaping_frequency] and raise "reaping_frequency is not supported (the ActiveRecord Reaper is thread-based)"
+      connection_spec.config[:reaping_frequency] = nil # starting in Rails 5, this defaults to 60 if not explicitly set
 
-      super(pool_config)
+      super(connection_spec, *args, **keyword_args)
 
       @reaper = nil # no need to keep a reference to this since it does nothing in this sub-class
+
+      # note that @reserved_connections is a ThreadSafe::Cache which is overkill in a fibered world, but harmless
     end
 
     def connection
@@ -256,7 +81,7 @@ module FiberedMysql2
     end
 
     def current_thread
-      Fiber.current
+      AsyncTask.current_or_none
     end
   end
 end

data/lib/fibered_mysql2/fibered_mysql2_connection_factory.rb

@@ -2,116 +2,27 @@
 
 require_relative '../active_record/connection_adapters/fibered_mysql2_adapter'
 
-module EM::Synchrony
-  module ActiveRecord
-    _ = Adapter_4_2
-    module Adapter_4_2
-      def configure_connection
-        super                   # undo EM::Synchrony's override here
-      end
-
-      def transaction(*args)
-        super                   # and here
-      end
-
-      _ = TransactionManager
-      class TransactionManager < _
-        # Overriding the em-synchrony override to bring it up to rails 6 requirements.
-        # Changes from the original Rails 6 source are:
-        #   1. the usage of _current_stack created by em-synchrony instead of the Rails provided @stack instance variable
-        #   2. the usage of Fiber.current.object_id as a part of the savepoint transaction name
-        #
-        # Original EM Synchrony Source:
-        # https://github.com/igrigorik/em-synchrony/blob/master/lib/em-synchrony/activerecord_4_2.rb#L35-L44
-        #
-        # Original Rails Source:
-        # https://github.com/rails/rails/blob/6-0-stable/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb#L205-L224
-        def begin_transaction(isolation: nil, joinable: true, _lazy: true)
-          @connection.lock.synchronize do
-            run_commit_callbacks = !current_transaction.joinable?
-            transaction =
-                if _current_stack.empty?
-                  ::ActiveRecord::ConnectionAdapters::RealTransaction.new(@connection, isolation:, joinable:, run_commit_callbacks: run_commit_callbacks)
-                else
-                  ::ActiveRecord::ConnectionAdapters::SavepointTransaction.new(@connection, "active_record_#{Fiber.current.object_id}_#{open_transactions}", _current_stack.last, isolation:, joinable:, run_commit_callbacks: run_commit_callbacks)
-                end
-
-            if @connection.supports_lazy_transactions? && lazy_transactions_enabled? && _lazy
-              @has_unmaterialized_transactions = true
-            else
-              transaction.materialize!
-            end
-            _current_stack.push(transaction)
-            transaction
-          end
-        end
-
-        # Overriding the ActiveRecord::TransactionManager#materialize_transactions method to use
-        # fiber safe the _current_stack instead of the @stack instance variable. when marterializing
-        # transactions.
-        def materialize_transactions
-          return if @materializing_transactions
-          return unless @has_unmaterialized_transactions
-
-          @connection.lock.synchronize do
-            begin
-              @materializing_transactions = true
-              _current_stack.each { |t| t.materialize! unless t.materialized? }
-            ensure
-              @materializing_transactions = false
-            end
-            @has_unmaterialized_transactions = false
-          end
-        end
-
-        # Overriding the ActiveRecord::TransactionManager#commit_transaction method to use
-        # fiber safe the _current_stack instead of the @stack instance variable. when marterializing
-        # transactions.
-        def commit_transaction
-          @connection.lock.synchronize do
-            transaction = _current_stack.last
-
-            begin
-              transaction.before_commit_records
-            ensure
-              _current_stack.pop
-            end
-
-            transaction.commit
-            transaction.commit_records
-          end
-        end
-
-        # Overriding the ActiveRecord::TransactionManager#rollback_transaction method to use
-        # fiber safe the _current_stack instead of the @stack instance variable. when marterializing
-        # transactions.
-        def rollback_transaction(transaction = nil)
-          @connection.lock.synchronize do
-            transaction ||= _current_stack.pop
-            transaction.rollback
-            transaction.rollback_records
-          end
-        end
-      end
-    end
-  end
-end
-
 module FiberedMysql2
   module FiberedMysql2ConnectionFactory
     def fibered_mysql2_connection(raw_config)
       config = raw_config.symbolize_keys
-      config[:flags] ||= 0
 
-      if config[:flags].kind_of? Array
-        config[:flags].push "FOUND_ROWS"
-      else
-        config[:flags] |= Mysql2::Client::FOUND_ROWS
-      end
       config[:username] = 'root' if config[:username].nil?
+      config[:flags]    = Mysql2::Client::FOUND_ROWS if Mysql2::Client.const_defined?(:FOUND_ROWS)
+
+      client =
+          begin
+            Mysql2::Client.new(config)
+          rescue Mysql2::Error => error
+            if error.message.include?("Unknown database")
+              raise ActiveRecord::NoDatabaseError.new(error.message)
+            else
+              raise
+            end
+          end
 
-      client = FiberedMysql2Adapter.new_client(config)
-      FiberedMysql2Adapter.new(client, logger, nil, config)
+      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
+      FiberedMysql2Adapter.new(client, logger, options, config)
     end
   end
 end

data/lib/fibered_mysql2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiberedMysql2
-  VERSION = "0.3.1"
+  VERSION = "1.0.0.colin.1"
 end

data/lib/fibered_mysql2.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
+require 'async'
 require 'fibered_mysql2/version'
 require_relative '../lib/active_record/connection_adapters/fibered_mysql2_adapter'
 require 'fibered_mysql2/fibered_database_connection_pool'
 require 'fibered_mysql2/fibered_mutex_with_waiter_priority'
 require 'fibered_mysql2/fibered_mysql2_connection_factory'
-require_relative 'fibered_mysql2/hash_config_override'
 
 module FiberedMysql2
   class Error < StandardError; end

metadata

@@ -1,49 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0.colin.1
 platform: ruby
 authors:
 - Invoca Development
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-31 00:00:00.000000000 Z
+date: 2023-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: em-synchrony
+  name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7'
 description:
 email:
 - development@invoca.com
@@ -51,6 +51,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".github/workflows/build.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
@@ -65,15 +66,14 @@ files:
 - bin/console
 - bin/setup
 - fibered_mysql2.gemspec
-- gemfiles/.bundle/config
-- gemfiles/rails_6_1.gemfile
-- gemfiles/rails_7_0.gemfile
+- gemfiles/rails_5.gemfile
+- gemfiles/rails_6.gemfile
 - lib/active_record/connection_adapters/fibered_mysql2_adapter.rb
 - lib/fibered_mysql2.rb
+- lib/fibered_mysql2/async_task.rb
 - lib/fibered_mysql2/fibered_database_connection_pool.rb
 - lib/fibered_mysql2/fibered_mutex_with_waiter_priority.rb
 - lib/fibered_mysql2/fibered_mysql2_connection_factory.rb
-- lib/fibered_mysql2/hash_config_override.rb
 - lib/fibered_mysql2/version.rb
 homepage: https://github.com/Invoca/fibered_mysql2
 licenses: []
@@ -91,11 +91,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: An adapter for fibered mysql2

data/gemfiles/.bundle/config

@@ -1,2 +0,0 @@
----
-BUNDLE_RETRY: "1"

data/lib/fibered_mysql2/hash_config_override.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require "active_record/database_configurations/hash_config"
-
-module FiberedMysql2
-  module HashConfigOverride
-    # Override the reaping_frequency method to return nil so that the connection pool does not reap connections when in fibered mode.
-    def reaping_frequency
-      nil
-    end
-  end
-end
-
-if ActiveRecord.gem_version >= "6.1"
-  ActiveRecord::DatabaseConfigurations::HashConfig.prepend(FiberedMysql2::HashConfigOverride)
-end