sequel-activerecord_connection 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98f7c003a3446727d0ff140e37f9965b2088dbb95c43fb58e84aeeaab2f9f85e
-  data.tar.gz: aba6068cf2804cbec9434cde909218c2b40b33fcb3b68dafe815a168125cb761
+  metadata.gz: ecd95c01a950e81d89914199827c09d3ef0b95b106cfe0601afa9dd40f395f62
+  data.tar.gz: 9f5c69f4291dfd46a1d07476a1fca226aafcdd6e6ef5c0ce697554a3c2d385e3
 SHA512:
-  metadata.gz: cca4d6b635c771444e656ab8231fd8a17c5a4da49b2a10d52ec640cf94c18ded25864dc72e293b6e7b5a6088c2d401df5d66dc2ba94d750bc975c9f5365601b2
-  data.tar.gz: b54b06b0bd97316856d690ec0ce4ebedcb9cf90664966e46ef6cf3d5c4ed56595b19f5bd10df666de388ea0426248add5c39f28489f93e2a766b1def6385e412
+  metadata.gz: 85877ab167fbca19e25b366c05f934488f610f23b790cdd360c80e67cf0cecce35104846807f77374671d6e8214008c5aaab88f5ce10d47106060e049dc94f59
+  data.tar.gz: d25ed24c5444c0c6cdfeb91857b42db90f8d3115f1ca678b4e7ec876845255d65737e8e5d2837c633058356ad7ac32ab5da71085c68c5021134765a19a10b7ee

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## HEAD
+
+* Avoid permanent checkout of Active Record 7.2+ connections (@janko)
+
+## 1.4.3 (2024-09-26)
+
+* Fix compatibility with adapters that don't support savepoints (@janko)
+
 ## 1.4.2 (2024-09-23)
 
 * Fix compatibility with newer versions of Oracle Enhanced adapter (@janko)

data/lib/sequel/extensions/activerecord_connection/postgres.rb

@@ -25,10 +25,12 @@ module Sequel
           fail Error, "#{key.inspect} transaction option is currently not supported" if opts.key?(key)
         end
 
-        super
-      rescue => e
-        activerecord_connection.clear_cache! if e.class.name == "ActiveRecord::PreparedStatementCacheExpired" && !in_transaction?
-        raise
+        super do |conn|
+          yield conn
+        rescue => e
+          activerecord_connection.clear_cache! if e.class.name == "ActiveRecord::PreparedStatementCacheExpired"
+          raise
+        end
       end
 
       private

data/lib/sequel/extensions/activerecord_connection.rb

@@ -39,7 +39,7 @@ module Sequel
 
     # Avoid calling Sequel's connection pool, instead use Active Record's.
     def synchronize(*)
-      activerecord_lock do
+      activerecord_synchronize do
         conn = activerecord_connection.raw_connection
 
         if activerecord_connection_class && !conn.is_a?(activerecord_connection_class)
@@ -47,9 +47,9 @@ module Sequel
         end
 
         yield conn
+      ensure
+        clear_activerecord_query_cache
       end
-    ensure
-      clear_activerecord_query_cache
     end
 
     # Log executed queries into Active Record logger as well.
@@ -70,7 +70,10 @@ module Sequel
     # information to know whether we're in a transaction, whether to create a
     # savepoint, when to run transaction/savepoint hooks etc.
     def _trans(conn)
-      hash = super || { savepoints: [], activerecord: true }
+      hash = super || { activerecord: true }
+
+      # adapters that don't support savepoints won't have this assigned
+      hash[:savepoints] ||= []
 
       # add any ActiveRecord transactions/savepoints that have been opened
       # directly via ActiveRecord::Base.transaction
@@ -137,7 +140,7 @@ module Sequel
       end
     end
 
-    if ActiveRecord.version >= Gem::Version.new("7.2.0")
+    if ActiveRecord.version >= Gem::Version.new("7.2")
       def activerecord_transaction_callback(type, &block)
         activerecord_connection.current_transaction.public_send(type, &block)
       end
@@ -155,6 +158,14 @@ module Sequel
       super
     end
 
+    def activerecord_synchronize
+      with_activerecord_connection do
+        activerecord_lock do
+          yield
+        end
+      end
+    end
+
     if ActiveRecord.version >= Gem::Version.new("7.0")
       def clear_activerecord_query_cache
         activerecord_model.clear_query_caches_for_current_thread
@@ -165,10 +176,22 @@ module Sequel
       end
     end
 
+    if ActiveRecord.version >= Gem::Version.new("7.2")
+      def with_activerecord_connection
+        activerecord_model.with_connection(prevent_permanent_checkout: true) do
+          yield activerecord_connection
+        end
+      end
+    else
+      def with_activerecord_connection
+        yield activerecord_connection
+      end
+    end
+
     # Active Record doesn't guarantee that a single connection can only be used
     # by one thread at a time, so we need to use locking, which is what Active
     # Record does internally as well.
-    if ActiveRecord.version >= Gem::Version.new("5.1.0")
+    if ActiveRecord.version >= Gem::Version.new("5.1")
       def activerecord_lock
         activerecord_connection.lock.synchronize do
           ActiveSupport::Dependencies.interlock.permit_concurrent_loads do

data/sequel-activerecord_connection.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "sequel-activerecord_connection"
-  spec.version       = "1.4.2"
+  spec.version       = "1.5.0"
   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.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-23 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel