sequel-activerecord_connection 1.4.3 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1459c431ad6f922b5c4400d85ae916e5032cab36a959041362f45817b604919d
-  data.tar.gz: 667fe2896a48d5d93d16e5c5b00e0d064c43d2687ef077bc9421e3d7869a41b6
+  metadata.gz: 8ba58fa3e98dd9f9c7ebe569bc5e7db5311f91820e331c9948c089c7f7db3ff7
+  data.tar.gz: 6e6c43ee2add8ca65abd531da15023d23ddcd244ed4fbb2eeef83285cd9eb8d7
 SHA512:
-  metadata.gz: c9f5cb40548c059e3319be0088b8a158dd66c18543fd31f1954db8bc848c4ef541ec1f779acc637211d730dfe4a080a805ee477f128474c9894cc6883e10f46d
-  data.tar.gz: 6068798de2efef62ae54cde36cb2d7abbad316aadc3eba6d5dceae1708e1aec36ec43b51cbeaf0f59609fd2be09e5d02b0f07afde5f646ebf39fb992e054b046
+  metadata.gz: ca1724bffc985de2ba03c2f939f0989d141f73ed301c511e0f7cefa86c3f2f5df797ec3c89d128011c4714b946728e6755047d9226ba5afe2d33649ecf76c4cc
+  data.tar.gz: 5c19ef6d4814433735ae0b4e42645217346507f5624f4e3f8ca90991dd749955e1cd7dc12dfc7ee9bde7714ecf3ea96acd7ec0be130921f41272b4eeea51a3b7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.5.1 (2024-11-08)
+
+* Add support for Active Record 8.0 (@phlipper)
+
+## 1.5.0 (2024-10-16)
+
+* Avoid permanent connection checkout on Active Record 7.2+ (@janko)
+
 ## 1.4.3 (2024-09-26)
 
 * Fix compatibility with adapters that don't support savepoints (@janko)

data/README.md

@@ -8,11 +8,11 @@ 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,
-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.
+It fully supports PostgreSQL, MySQL and SQLite adapters, both the native ones
+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.
 
 ## Why reuse the database connection?
 
@@ -44,9 +44,9 @@ The only hard dependencies are:
 
 * [ActiveRecord](https://github.com/rails/rails/tree/main/activerecord)
 * [Sequel](https://github.com/jeremyevans/sequel)
-* [after_commit_everywhere](https://github.com/Envek/after_commit_everywhere)
+* [after_commit_everywhere](https://github.com/Envek/after_commit_everywhere) (on Active Record 7.1 or older)
 
-...which means you can use it with any Rack / Ruby based framework: 
+...which means you can use it with any Rack / Ruby based framework:
 Rails / Roda / Sinatra etc. or even without a framework.
 
 ## Installation
@@ -245,19 +245,6 @@ Sequel.postgres(extensions: [:activerecord_connection, :sql_log_normalizer])
 SELECT accounts.* FROM accounts WHERE accounts.email = ? LIMIT ?
 ```
 
-Note that the `sql_log_normalizer` extension opens a database connection while
-it's being loaded. If you're setting up Sequel in a Rails initializer, you'll
-probably want to handle the database not existing, so that commands such as
-`rails db:create` continue to work.
-
-```rb
-DB = Sequel.postgres(extensions: :activerecord_connection)
-begin
-  DB.extension :sql_log_normalizer
-rescue ActiveRecord::NoDatabaseError
-end
-```
-
 ## Tests
 
 You'll first want to run the rake tasks for setting up databases and users:

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.
@@ -140,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
@@ -158,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
@@ -168,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.3"
+  spec.version       = "1.5.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.5"
 
   spec.add_dependency "sequel", "~> 5.38"
-  spec.add_dependency "activerecord", ">= 5.0", "< 8"
+  spec.add_dependency "activerecord", ">= 5.0", "< 8.1"
   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.4.3
+  version: 1.5.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -33,7 +33,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: after_commit_everywhere
   requirement: !ruby/object:Gem::Requirement