sequel-activerecord_connection 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94acb3799fdbf874ddad7c419bba8e39c75e09a4e59c724e28a69249fe434e35
-  data.tar.gz: 1ad5e5b556427804e682dc6948626c557a89e62030ad8b9ee2827905dea245fe
+  metadata.gz: f6e3934544ded0f6495b75e5a04a8a9adb1d98d9d6b5d76420c45b72c94a4898
+  data.tar.gz: 44fcd4c9c5b5c0f3c1fc9804b9ae3568aca9d7d2623fbb3e3181b52c1e2acc2a
 SHA512:
-  metadata.gz: 876b0d32959a6263e2e6ac7309bdab3833fd07e0778ec1b5437abd8a61417b32fe7034e8473c916accae59e34f2bb64ce3e875a180d0abadfccc6c5725a98a51
-  data.tar.gz: b32f9486f8a3452e5c99fd5aa28dfdb6322a788267dc4307c76a8d2d01b83070de62aed105c91b41d3620a112d36d630dd114e383330bb0701430a167f32d901
+  metadata.gz: 560c34801be1e01717c4d1939ab5745c473df770dbe0d6366ad6cf9f14fe2b7920ae0bd39c8b59b602a70b12a1bbeb3ef34522c02410ad7c6a1d8fb8139340dc
+  data.tar.gz: fe7b20203fafa3414360e5cee9aeb6994b0205838dc82abcc83c9a03b17a8e707c69c49c5f06c4ec6c4019216d80a1e6b0c0f843a935ef11c35601a323064146

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.4.1 (2024-05-10)
+
+* Fix `#rollback_checker`, `#rollback_on_exit` and `#after_rollback` not working reliably on JRuby and Sequel 5.78+ (@janko)
+
+* Use native transaction callbacks on Active Record 7.2+ (@janko)
+
 ## 1.4.0 (2024-03-19)
 
 * Only warn when Sequel extension fails to initialize because there is no database (@janko)

data/lib/sequel/extensions/activerecord_connection.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "after_commit_everywhere"
-
 module Sequel
   module ActiveRecordConnection
     Error = Class.new(Sequel::Error)
@@ -16,6 +14,7 @@ module Sequel
     def self.extended(db)
       db.activerecord_model = ActiveRecord::Base
       db.opts[:test] = false unless db.opts.key?(:test)
+      db.instance_variable_set(:@transactions, {}) if RUBY_ENGINE == "jruby"
 
       begin
         require "sequel/extensions/activerecord_connection/#{db.adapter_scheme}"
@@ -120,7 +119,7 @@ module Sequel
     # after_commit_everywhere gem.
     def add_transaction_hook(conn, type, block)
       if _trans(conn)[:activerecord]
-        AfterCommitEverywhere.public_send(type, &block)
+        activerecord_transaction_callback(type, &block)
       else
         super
       end
@@ -132,12 +131,24 @@ module Sequel
     # after_commit_everywhere gem.
     def add_savepoint_hook(conn, type, block)
       if _trans(conn)[:savepoints].last[:activerecord]
-        AfterCommitEverywhere.public_send(type, &block)
+        activerecord_transaction_callback(type, &block)
       else
         super
       end
     end
 
+    if ActiveRecord.version >= Gem::Version.new("7.2.0.alpha")
+      def activerecord_transaction_callback(type, &block)
+        activerecord_connection.current_transaction.public_send(type, &block)
+      end
+    else
+      require "after_commit_everywhere"
+
+      def activerecord_transaction_callback(type, &block)
+        AfterCommitEverywhere.public_send(type, &block)
+      end
+    end
+
     # Prevents sql_log_normalizer DB extension from skipping the normalization.
     def skip_logging?
       return false if @loaded_extensions.include?(:sql_log_normalizer)

data/sequel-activerecord_connection.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "sequel-activerecord_connection"
-  spec.version       = "1.4.0"
+  spec.version       = "1.4.1"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Allows Sequel to use ActiveRecord connection for database interaction.