sequel-activerecord_connection 1.3.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e7023579a13396cf034b357786ebf56c98c15a09693ffe97900c86b221cc596
-  data.tar.gz: ff4b9033f260499e70a7f82ee901a77a8e370b230e968072c04d9ae5d4226029
+  metadata.gz: f6e3934544ded0f6495b75e5a04a8a9adb1d98d9d6b5d76420c45b72c94a4898
+  data.tar.gz: 44fcd4c9c5b5c0f3c1fc9804b9ae3568aca9d7d2623fbb3e3181b52c1e2acc2a
 SHA512:
-  metadata.gz: ac0955585457b396ffe074ddb6c040adba15b42052d1c1649635c85223b7cee86e11986b639cbe2a868048ab6926d410f5564210ef745101aa880d591242c57d
-  data.tar.gz: 459fd7c8b13036b93afe8dfd9a63af1137997ad04fd8e340a9a218c31196ff319dc29861647bfffd9e9a338a21a3cacb88439d04e45fff09f5fa81765167025f
+  metadata.gz: 560c34801be1e01717c4d1939ab5745c473df770dbe0d6366ad6cf9f14fe2b7920ae0bd39c8b59b602a70b12a1bbeb3ef34522c02410ad7c6a1d8fb8139340dc
+  data.tar.gz: fe7b20203fafa3414360e5cee9aeb6994b0205838dc82abcc83c9a03b17a8e707c69c49c5f06c4ec6c4019216d80a1e6b0c0f843a935ef11c35601a323064146

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 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)
+
+* Drop support for Active Record 4.2 (@janko)
+
 ## 1.3.1 (2023-04-22)
 
 * Fix Active Record's query cache not being cleared in SQLite adapter (@janko)

data/README.md

@@ -8,8 +8,8 @@ This can be useful if you want to use a library that uses Sequel (e.g.
 or if you just want to use Sequel for more complex queries, and you want to
 avoid creating new database connections.
 
-It works on ActiveRecord 4.2+ and fully supports PostgresSQL, MySQL and SQLite
-adapters, both native and JDBC (JRuby). The [SQL Server] external adapter is
+It works on ActiveRecord 4.2+ and fully supports PostgresSQL, MySQL and SQLite,
+both the native adapters and JDBC (JRuby). The [SQL Server] external adapter is
 supported as well (`tinytds` in Sequel), and there is attempted support for
 [Oracle enhanced] (`oracle` and in Sequel). Other adapters might work too, but
 their integration hasn't been tested.

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}"
@@ -32,6 +31,12 @@ module Sequel
       raise Error, "creating a Sequel connection is not allowed"
     end
 
+    def extension(*)
+      super
+    rescue ActiveRecord::NoDatabaseError
+      warn "Sequel database extension #{@loaded_extensions.last.inspect} failed to initialize because there is no database."
+    end
+
     # Avoid calling Sequel's connection pool, instead use Active Record's.
     def synchronize(*)
       activerecord_lock do
@@ -43,6 +48,8 @@ module Sequel
 
         yield conn
       end
+    ensure
+      clear_activerecord_query_cache
     end
 
     # Log executed queries into Active Record logger as well.
@@ -57,17 +64,6 @@ module Sequel
       @timezone || activerecord_timezone
     end
 
-    # Clear Active Record's query cache after potential data modifications.
-    %i[execute_ddl execute_dui execute_insert execute].each do |execute_method|
-      define_method(execute_method) do |*args, &block|
-        begin
-          super(*args, &block)
-        ensure
-          clear_activerecord_query_cache
-        end
-      end
-    end
-
     private
 
     # Synchronizes transaction state with ActiveRecord. Sequel uses this
@@ -123,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
@@ -135,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.3.1"
+  spec.version       = "1.4.1"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.4"
 
   spec.add_dependency "sequel", "~> 5.38"
-  spec.add_dependency "activerecord", ">= 4.2", "< 8"
+  spec.add_dependency "activerecord", ">= 5.0", "< 8"
   spec.add_dependency "after_commit_everywhere", "~> 1.1"
 
   spec.add_development_dependency "sequel_pg" unless RUBY_ENGINE == "jruby"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-22 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Allows Sequel to use ActiveRecord connection for database interaction.