fibered_mysql2 0.3.0 → 0.4.0.pre.tstarck.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b26f8b41b8008965bde3defa980553ef3f5ee82dc750d510f98d1728db1dfb2b
-  data.tar.gz: 8a6ff673f5be6e742bb010c217061a78012206d515cd2450efaf17159d208d90
+  metadata.gz: f4de2661b6a53134802496ea91ed73ad10623ee8459f1d4ecdb1ebdef6ea4f63
+  data.tar.gz: 8846ea290e1ed8ccab648c55458809b63cb4a1ca737f405f0ece815b441104cf
 SHA512:
-  metadata.gz: a2f5e70e6f236fcd7fea48e50bc09e33571d2d301e0f1eaa204f90d04e22fbd80585de33c3afd1dea13dea40076a56a158e2e39eeed7203c4b6c6b79b5a6fce4
-  data.tar.gz: 3b5e28792b82a53a7c43e937b30d953617c31399c6a34a74aba2e8d8e454661dc9a2c19728e6ccffa21b6e1a8481052073ccc48f2db84567baa5fb4bfe2b6707
+  metadata.gz: 68e08cebe9eec799298274fa1be5e3f83f7b896b5cbdebad3b3b5cb082fabb92388b80310cdb8bd376605374db8460dad4f9fde4746385d9e9d03f53278bf0a2
+  data.tar.gz: 1ea97ac7495a0bc0085aaf4f45e226ad9110f879d893673ae646c48753f90f4c456156bb29ca63c36ddf827fff96a7aab934f80d43c27dbc534fd602db8472be

data/.github/workflows/build.yml

@@ -8,11 +8,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.1, 3.2, 3.3]
+        ruby: [3.1, 3.2, 3.3, 3.4]
         gemfile:
         - Gemfile
-        - gemfiles/rails_6_1.gemfile
         - gemfiles/rails_7_0.gemfile
+        - gemfiles/rails_7_1.gemfile
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
@@ -20,6 +20,5 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 2.2.29
         bundler-cache: true
     - run: bundle exec rspec

data/.ruby-version

@@ -1 +1 @@
-3.1.6
+3.3.8

data/Appraisals

@@ -2,4 +2,10 @@
 
 require "appraisal/matrix"
 
-appraisal_matrix(rails: [">= 6.1", "< 7.1"])
+appraisal_matrix(rails: [">= 7.0", "< 7.2"]) do |rails:|
+  if rails < "7.1"
+    gem "mutex_m"
+    gem "base64"
+    gem "bigdecimal"
+  end
+end

data/CHANGELOG.md

@@ -4,6 +4,27 @@ 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.4.0] - Unreleased
+### Added
+- Support for Rails 7.1
+
+### Removed
+- Removed support for Rails 6.1 and below.
+
+### Changed
+#### FiberedMysql2Adapter
+- Updated to no longer include EM::Synchrony::ActiveRecord::Adapter_4_2 as it is no longer necessary.
+- Removed TransactionManager overrides as they are no longer necessary.
+
+#### FiberedMysql2::FiberedDatabaseConnectionPool
+- Updated to only override methods needed in Rails 7.0.
+- Removed double-checking in #connection for cached connection.
+- Updated #checkout patch to use #reap instead of our custom #reaped_connections method.
+
+## [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.

data/Gemfile

@@ -7,10 +7,9 @@ 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 'rspec', '~> 3.12.0' # Rspec 3.13 is causing segfaults for some reason in CI...

data/Gemfile.lock

@@ -1,77 +1,89 @@
 PATH
   remote: .
   specs:
-    fibered_mysql2 (0.3.0)
+    fibered_mysql2 (0.4.0.pre.tstarck.1)
       em-synchrony (~> 1.0)
-      rails (>= 6.1, < 7.1)
+      rails (>= 7.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.8.5)
-      actionpack (= 7.0.8.5)
-      activesupport (= 7.0.8.5)
+    actioncable (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8.5)
-      actionpack (= 7.0.8.5)
-      activejob (= 7.0.8.5)
-      activerecord (= 7.0.8.5)
-      activestorage (= 7.0.8.5)
-      activesupport (= 7.0.8.5)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.8.5)
-      actionpack (= 7.0.8.5)
-      actionview (= 7.0.8.5)
-      activejob (= 7.0.8.5)
-      activesupport (= 7.0.8.5)
+    actionmailer (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.8.5)
-      actionview (= 7.0.8.5)
-      activesupport (= 7.0.8.5)
-      rack (~> 2.0, >= 2.2.4)
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.5.1)
+      actionview (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8.5)
-      actionpack (= 7.0.8.5)
-      activerecord (= 7.0.8.5)
-      activestorage (= 7.0.8.5)
-      activesupport (= 7.0.8.5)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8.5)
-      activesupport (= 7.0.8.5)
+    actionview (7.1.5.1)
+      activesupport (= 7.1.5.1)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.8.5)
-      activesupport (= 7.0.8.5)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.8.5)
-      activesupport (= 7.0.8.5)
-    activerecord (7.0.8.5)
-      activemodel (= 7.0.8.5)
-      activesupport (= 7.0.8.5)
-    activestorage (7.0.8.5)
-      actionpack (= 7.0.8.5)
-      activejob (= 7.0.8.5)
-      activerecord (= 7.0.8.5)
-      activesupport (= 7.0.8.5)
+    activemodel (7.1.5.1)
+      activesupport (= 7.1.5.1)
+    activerecord (7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      timeout (>= 0.4.0)
+    activestorage (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.8.5)
+    activesupport (7.1.5.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
     appraisal (2.5.0)
       bundler
@@ -79,31 +91,36 @@ GEM
       thor (>= 0.14.0)
     appraisal-matrix (0.3.0)
       appraisal (~> 2.2)
-    bigdecimal (3.1.8)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
     builder (3.3.0)
-    byebug (11.1.3)
+    byebug (12.0.0)
+    cgi (0.5.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
-    coveralls (0.8.23)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (>= 0.19.4, < 2.0)
-      tins (~> 1.6)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     crass (1.0.6)
-    date (3.3.4)
-    diff-lcs (1.5.1)
-    docile (1.4.1)
+    date (3.4.1)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
     em-synchrony (1.0.6)
       eventmachine (>= 1.0.0.beta.1)
-    erubi (1.13.0)
+    erb (4.0.4)
+      cgi (>= 0.3.3)
+    erubi (1.13.1)
     eventmachine (1.2.7)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    loofah (2.22.0)
+    io-console (0.8.1)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -114,90 +131,100 @@ GEM
     marcel (1.0.4)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
+    mutex_m (0.3.0)
     mysql2 (0.5.6)
-    net-imap (0.5.0)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.3)
-    nokogiri (1.16.7)
+    nio4r (2.7.4)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    pry (0.14.2)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
+    pry-byebug (3.11.0)
+      byebug (~> 12.0)
+      pry (>= 0.13, < 0.16)
+    psych (5.2.6)
+      date
+      stringio
     racc (1.8.1)
-    rack (2.2.10)
-    rack-test (2.1.0)
+    rack (3.2.0)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rails (7.0.8.5)
-      actioncable (= 7.0.8.5)
-      actionmailbox (= 7.0.8.5)
-      actionmailer (= 7.0.8.5)
-      actionpack (= 7.0.8.5)
-      actiontext (= 7.0.8.5)
-      actionview (= 7.0.8.5)
-      activejob (= 7.0.8.5)
-      activemodel (= 7.0.8.5)
-      activerecord (= 7.0.8.5)
-      activestorage (= 7.0.8.5)
-      activesupport (= 7.0.8.5)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails (7.1.5.1)
+      actioncable (= 7.1.5.1)
+      actionmailbox (= 7.1.5.1)
+      actionmailer (= 7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actiontext (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.8.5)
-    rails-dom-testing (2.2.0)
+      railties (= 7.1.5.1)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.0.8.5)
-      actionpack (= 7.0.8.5)
-      activesupport (= 7.0.8.5)
-      method_source
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      irb
+      rackup (>= 1.0.0)
       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)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rake (13.3.0)
+    rdoc (6.14.2)
+      erb
+      psych (>= 4.0.0)
+    reline (0.6.2)
+      io-console (~> 0.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.3)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.7)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sync (0.5.0)
-    term-ansicolor (1.11.2)
-      tins (~> 1.0)
-    thor (1.3.2)
-    timeout (0.4.1)
-    tins (1.33.0)
-      bigdecimal
-      sync
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.2)
+    securerandom (0.4.1)
+    stringio (3.1.7)
+    thor (1.4.0)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.6)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.6.18)
@@ -208,14 +235,13 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   appraisal-matrix
-  coveralls
   fibered_mysql2!
   mysql2 (~> 0.5)
   nokogiri
   pry
   pry-byebug
   rake
-  rspec
+  rspec (~> 3.12.0)
 
 BUNDLED WITH
-   2.2.29
+   2.6.9

data/fibered_mysql2.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'em-synchrony', '~> 1.0'
-  spec.add_dependency 'rails', '>= 6.1', '< 7.1'
+  spec.add_dependency 'rails', '>= 7.0', '< 7.2'
 end

data/gemfiles/rails_7_0.gemfile

@@ -4,13 +4,15 @@ 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 "rspec", "~> 3.12.0"
 gem "rails", "~> 7.0.0"
+gem "mutex_m"
+gem "base64"
+gem "bigdecimal"
 
 gemspec path: "../"

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

@@ -4,13 +4,12 @@ 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 "rspec", "~> 3.12.0"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

data/lib/active_record/connection_adapters/fibered_mysql2_adapter.rb

@@ -3,10 +3,12 @@
 require 'em-synchrony'
 require 'active_model'
 require 'active_record/errors'
-require 'active_record/connection_adapters/em_mysql2_adapter'
+
+require 'active_record/connection_adapters/mysql2_adapter'
+require 'em-synchrony/mysql2'
 
 module FiberedMysql2
-  module FiberedMysql2Adapter_5_2
+  module FiberedMysql2Adapter_7_0
     def lease
       if in_use?
         msg = "Cannot lease connection, ".dup
@@ -61,28 +63,22 @@ module FiberedMysql2
     end
   end
 
-  class FiberedMysql2Adapter < ::ActiveRecord::ConnectionAdapters::EMMysql2Adapter
-    include FiberedMysql2Adapter_5_2
+  class FiberedMysql2Adapter < ::ActiveRecord::ConnectionAdapters::Mysql2Adapter
+    if ::ActiveRecord.gem_version < "7.1"
+      include FiberedMysql2Adapter_7_0
+    end
 
     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 == ConnectionAdapters::Mysql2Adapter::ER_BAD_DB_ERROR
-          raise ActiveRecord::NoDatabaseError.db_error(config[:database])
-        elsif error.error_number == ConnectionAdapters::Mysql2Adapter::ER_ACCESS_DENIED_ERROR
-          raise ActiveRecord::DatabaseConnectionError.username_error(config[:username])
-        elsif [ConnectionAdapters::Mysql2Adapter::ER_CONN_HOST_ERROR, ConnectionAdapters::Mysql2Adapter::ER_UNKNOWN_HOST_ERROR].include?(error.error_number)
-          raise ActiveRecord::DatabaseConnectionError.hostname_error(config[:host])
+        if error.error_number == 1049
+          raise ActiveRecord::NoDatabaseError.new, error.message
         else
           raise ActiveRecord::ConnectionNotEstablished, error.message
         end
       end
     end
-
-    def initialize(*args)
-      super
-    end
   end
 end

data/lib/fibered_mysql2/fibered_database_connection_pool.rb

@@ -184,33 +184,36 @@ module FiberedMysql2
   end
 
   module FiberedDatabaseConnectionPool
-    include FiberedMonitorMixin
-
-    module Adapter_5_2
-      def cached_connections
-        @thread_cached_conns
+    module Adapter_7_0
+      def release_connection(owner_thread = Fiber.current)
+        if (conn = @thread_cached_conns.delete(connection_cache_key(owner_thread)))
+          checkin(conn)
+        end
       end
 
-      def current_connection_id
-        connection_cache_key(current_thread)
+      def with_connection
+        unless (conn = cached_connections[current_connection_id]) # Invoca Patch to use Fiber
+          conn = connection
+          fresh_connection = true
+        end
+        yield conn
+      ensure
+        release_connection if fresh_connection
       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
+      def current_thread
+        Fiber.current
       end
 
-      def release_connection(owner_thread = Fiber.current)
-        if (conn = @thread_cached_conns.delete(connection_cache_key(owner_thread)))
-          checkin(conn)
-        end
+      def connection
+        cached_connections[current_connection_id] ||= checkout
       end
     end
-    include Adapter_5_2
+
+    if ::ActiveRecord.gem_version < "7.1"
+      include Adapter_7_0
+    end
+    include FiberedMonitorMixin # This is switches the connection pool's mutex and condition variables to event machine / Fiber compatible ones.
 
     def initialize(pool_config)
       if pool_config.db_config.reaping_frequency
@@ -222,41 +225,23 @@ module FiberedMysql2
       @reaper = nil # no need to keep a reference to this since it does nothing in this sub-class
     end
 
-    def connection
-      # this is correctly done double-checked locking
-      # (ThreadSafe::Cache's lookups have volatile semantics)
-      if (result = cached_connections[current_connection_id])
-        result
-      else
-        synchronize do
-          if (result = cached_connections[current_connection_id])
-            result
-          else
-            cached_connections[current_connection_id] = checkout
-          end
-        end
-      end
-    end
-
-    def reap_connections
-      cached_connections.values.each do |connection|
-        unless connection.owner.alive?
-          checkin(connection)
-        end
-      end
+    def current_connection_id
+      connection_cache_key(current_thread)
     end
 
-    private
-
-    #--
-    # This hook-in method allows for easier monkey-patching fixes needed by
-    # JRuby users that use Fibers.
-    def connection_cache_key(fiber)
-      fiber
+    def cached_connections
+      @thread_cached_conns
     end
 
-    def current_thread
-      Fiber.current
+    # Invoca patch that reaps orphaned connections on checkout. This lets us immediately use a connection left open by dead fibers
+    # instead of waiting for all connections to be used in the pool before they are reaped.
+    def checkout(checkout_timeout = @checkout_timeout)
+      begin
+        reap
+      rescue => ex
+        ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
+      end
+      super
     end
   end
 end

data/lib/fibered_mysql2/fibered_mysql2_connection_factory.rb

@@ -2,101 +2,6 @@
 
 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)

data/lib/fibered_mysql2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiberedMysql2
-  VERSION = "0.3.0"
+  VERSION = "0.4.0.pre.tstarck.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0.pre.tstarck.1
 platform: ruby
 authors:
 - Invoca Development
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2025-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 description:
 email:
 - development@invoca.com
@@ -66,8 +66,8 @@ files:
 - bin/setup
 - fibered_mysql2.gemspec
 - gemfiles/.bundle/config
-- gemfiles/rails_6_1.gemfile
 - gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_1.gemfile
 - lib/active_record/connection_adapters/fibered_mysql2_adapter.rb
 - lib/fibered_mysql2.rb
 - lib/fibered_mysql2/fibered_database_connection_pool.rb
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: An adapter for fibered mysql2