sequel-activerecord_connection 1.5.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ba58fa3e98dd9f9c7ebe569bc5e7db5311f91820e331c9948c089c7f7db3ff7
-  data.tar.gz: 6e6c43ee2add8ca65abd531da15023d23ddcd244ed4fbb2eeef83285cd9eb8d7
+  metadata.gz: 042736dc5ad00fd808dd145caa564065a11926b9bdc93698fed9a8f5b0e4aff9
+  data.tar.gz: 909816335c6b1001c605fff430bab10853c0746b2c21bd0741c4e8db58164abb
 SHA512:
-  metadata.gz: ca1724bffc985de2ba03c2f939f0989d141f73ed301c511e0f7cefa86c3f2f5df797ec3c89d128011c4714b946728e6755047d9226ba5afe2d33649ecf76c4cc
-  data.tar.gz: 5c19ef6d4814433735ae0b4e42645217346507f5624f4e3f8ca90991dd749955e1cd7dc12dfc7ee9bde7714ecf3ea96acd7ec0be130921f41272b4eeea51a3b7
+  metadata.gz: eb1cc2a21b801ec092e6e7b9fa7980f5a340371d72b8d4ab7afaec58f5a7eb9b2362292c9397eab2a4e6f80aa7e930b90d89cc07c617b884ac28e982bdeb7978
+  data.tar.gz: ad0b5848a8348e2566d1f1c7f51289de04aa4eba2549172c3f375f97dc06435f5bbe669426aef82ffad02cc0b0a1db63e0f76b11fdbba3bd4b021776a43ecf2a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.0.1 (2025-10-25)
+
+* Allow Active Record 8.1+ (@janko)
+
+## 2.0.0 (2024-11-10)
+
+* The `after_commit_everywhere` gem now needs to be added to the Gemfile manually on Active Record < 7.2 (@janko)
+
 ## 1.5.1 (2024-11-08)
 
 * Add support for Active Record 8.0 (@phlipper)

data/README.md

@@ -27,27 +27,10 @@ an Active Record transaction, that query won't actually be executed inside a
 database transaction. This is because transactions are tied to the database
 connection; if one connection opens a transaction, this doesn't affect queries
 executed on a different connection, even if both connections are used in the
-same ruby process. With this library, transactions and queries can be
-seamlessly combined between Active Record and Sequel.
+same ruby process.
 
-In Rails context, there are additional considerations for a Sequel connection
-to play nicely. Connecting and disconnecting would have to go in lockstep with
-Active Record, to make commands such as `rails db:create` and `rails db:drop`
-work. You'd also need to find a way for system tests and the app running in the
-background to share the same database connection, which is something Sequel
-wasn't designed for. Reusing Active Record's connection means (dis)connecting
-and sharing between threads is all handled automatically.
-
-## Framework Agnostic
-
-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) (on Active Record 7.1 or older)
-
-...which means you can use it with any Rack / Ruby based framework:
-Rails / Roda / Sinatra etc. or even without a framework.
+With this library, transactions and queries can be seamlessly combined between
+Active Record and Sequel.
 
 ## Installation
 
@@ -57,6 +40,12 @@ Add the gem to your project:
 $ bundle add sequel-activerecord_connection
 ```
 
+If you're using Active Record 7.1 or older, you'll also need to add the [after_commit_everywhere] gem:
+
+```sh
+$ bundle add after_commit_everywhere # on Active Record 7.1 or older
+```
+
 ## Usage
 
 Assuming you've configured your ActiveRecord connection, you can initialize the
@@ -67,7 +56,7 @@ appropriate Sequel adapter and load the `activerecord_connection` extension: e.g
 # e.g. Rails: config/initializers/sequel.rb
 
 require "sequel"
-DB = Sequel.postgres(extensions: :activerecord_connection) # postgres
+DB = Sequel.postgres(extensions: :activerecord_connection) # for PostgreSQL
 ```
 
 Now any Sequel operations that you make will internaly be done using the
@@ -286,3 +275,4 @@ Everyone interacting in this project's codebases, issue trackers, chat rooms and
 [Oracle enhanced]: https://github.com/rsim/oracle-enhanced
 [SQL Server]: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter
 [sql_log_normalizer]: https://sequel.jeremyevans.net/rdoc-plugins/files/lib/sequel/extensions/sql_log_normalizer_rb.html
+[after_commit_everywhere]: https://github.com/Envek/after_commit_everywhere

data/lib/sequel/extensions/activerecord_connection.rb

@@ -118,8 +118,7 @@ module Sequel
 
     # When Active Record holds the transaction, we cannot use Sequel hooks,
     # because Sequel doesn't have knowledge of when the transaction is
-    # committed. So in this case we register an Active Record hook using the
-    # after_commit_everywhere gem.
+    # committed. So in this case we register the hook using Active Record.
     def add_transaction_hook(conn, type, block)
       if _trans(conn)[:activerecord]
         activerecord_transaction_callback(type, &block)
@@ -130,8 +129,7 @@ module Sequel
 
     # When Active Record holds the savepoint, we cannot use Sequel hooks,
     # because Sequel doesn't have knowledge of when the savepoint is
-    # released. So in this case we register an Active Record hook using the
-    # after_commit_everywhere gem.
+    # released. So in this case we register the hook using Active Record.
     def add_savepoint_hook(conn, type, block)
       if _trans(conn)[:savepoints].last[:activerecord]
         activerecord_transaction_callback(type, &block)
@@ -145,7 +143,12 @@ module Sequel
         activerecord_connection.current_transaction.public_send(type, &block)
       end
     else
-      require "after_commit_everywhere"
+      begin
+        gem "after_commit_everywhere", "~> 1.1"
+        require "after_commit_everywhere"
+      rescue LoadError
+        fail Error, %q(You need to add `gem "after_commit_everywhere", "~> 1.1"` to your Gemfile when using Active Record < 7.2)
+      end
 
       def activerecord_transaction_callback(type, &block)
         AfterCommitEverywhere.public_send(type, &block)
@@ -191,18 +194,12 @@ module Sequel
     # 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")
-      def activerecord_lock
-        activerecord_connection.lock.synchronize do
-          ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-            yield
-          end
+    def activerecord_lock
+      activerecord_connection.lock.synchronize do
+        ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+          yield
         end
       end
-    else
-      def activerecord_lock
-        yield
-      end
     end
 
     def activerecord_connection

data/sequel-activerecord_connection.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |spec|
   spec.name          = "sequel-activerecord_connection"
-  spec.version       = "1.5.1"
+  spec.version       = "2.0.1"
   spec.authors       = ["Janko Marohnić"]
-  spec.email         = ["janko.marohnic@gmail.com"]
+  spec.email         = ["janko@hey.com"]
 
   spec.summary       = %q{Allows Sequel to use ActiveRecord connection for database interaction.}
   spec.description   = %q{Allows Sequel to use ActiveRecord connection for database interaction.}
@@ -12,8 +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.1"
-  spec.add_dependency "after_commit_everywhere", "~> 1.1"
+  spec.add_dependency "activerecord", ">= 5.1"
 
   spec.add_development_dependency "sequel_pg" unless RUBY_ENGINE == "jruby"
   spec.add_development_dependency "minitest"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Janko Marohnić
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -30,34 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.1'
-- !ruby/object:Gem::Dependency
-  name: after_commit_everywhere
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: sequel_pg
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +81,7 @@ dependencies:
         version: '0'
 description: Allows Sequel to use ActiveRecord connection for database interaction.
 email:
-- janko.marohnic@gmail.com
+- janko@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -123,7 +102,6 @@ homepage: https://github.com/janko/sequel-activerecord_connection
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,8 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Allows Sequel to use ActiveRecord connection for database interaction.
 test_files: []