sequel-activerecord_connection 1.2.2 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bb2b81760b45990a9bea2801f8a243cfc180853ad450d652cf888cd45844033
-  data.tar.gz: 73ae4c6341a3c694423b4e20da86f01cce3324d37a9a29143eb2f2e420d45288
+  metadata.gz: aa32893e39b55c6e2b8186c216645a4cccfa7e865795e390656ebac83d5ecd1d
+  data.tar.gz: c8d6ba5b2958de6e8e3d687c75f4a51a60c863a1728de525ef222650cd34b490
 SHA512:
-  metadata.gz: 4e27142472fabc36703d3cca6828e005858d60088a88bbb8f78c58dba5f6e9a2b2ae349ff6d39451558d7dd3e4e32e92d49818af88af9bb6bc18a522c283bc38
-  data.tar.gz: 6dff47d6fe0adf995dc3738e932bda92b15279b56bdf22750e6c42058031ca2b2f152e26cd80b2a09e3be460a1be8695a3645df8a2bcd4a87430ebfc3243fa98
+  metadata.gz: fba2ec585154bfd9477b2ace86b7c6b6b36cc5b4ba11f21a62bde593b1c8069858fb33d4984dced898b02a831f75fd2219c43adb26d67b93d17ce0313965c30a
+  data.tar.gz: 685f0dd698849465d1902ee7cd4432d2de6ea25f7791707a6defae8f32ff0e66713a4f391573924e79dfe3f91723fa564083b1dbefbf2c2986047205fe024aec

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 1.2.6 (2021-12-26)
+
+* Speed up `#activerecord_lock` by avoiding checking Active Record version at runtime (@janko)
+
+## 1.2.5 (2021-12-19)
+
+* Loosen Active Record dependency to allow any 7.x version (@janko)
+
+* Drop support for Ruby 2.3 (@janko)
+
+* Allow using the `sql_log_normalizer` Sequel database extension (@janko)
+
+## 1.2.4 (2021-09-27)
+
+* Allow using with Active Record 7.0 (@janko)
+
+* Use `ActiveRecord.default_timezone` on Active Record 7.0 or greater (@janko)
+
+## 1.2.3 (2021-07-17)
+
+* Bump `after_commit_everywhere` dependency to `~> 1.0` (@wivarn)
+
 ## 1.2.2 (2021-01-11)
 
 * Ensure Active Record queries inside a Sequel transaction are typemapped correctly in postgres adapter (@janko)

data/lib/sequel/extensions/activerecord_connection.rb

@@ -13,8 +13,6 @@ module Sequel
       serializable: :serializable,
     }
 
-    ACTIVERECORD_CALLBACKS = Object.new.extend(AfterCommitEverywhere)
-
     def self.extended(db)
       db.activerecord_model = ActiveRecord::Base
       db.opts[:test] = false unless db.opts.key?(:test)
@@ -50,7 +48,7 @@ module Sequel
 
     # Match database timezone with Active Record.
     def timezone
-      @timezone || ActiveRecord::Base.default_timezone
+      @timezone || activerecord_timezone
     end
 
     private
@@ -108,7 +106,7 @@ module Sequel
     # after_commit_everywhere gem.
     def add_transaction_hook(conn, type, block)
       if _trans(conn)[:activerecord]
-        ACTIVERECORD_CALLBACKS.public_send(type, &block)
+        AfterCommitEverywhere.public_send(type, &block)
       else
         super
       end
@@ -120,23 +118,33 @@ module Sequel
     # after_commit_everywhere gem.
     def add_savepoint_hook(conn, type, block)
       if _trans(conn)[:savepoints].last[:activerecord]
-        ACTIVERECORD_CALLBACKS.public_send(type, &block)
+        AfterCommitEverywhere.public_send(type, &block)
       else
         super
       end
     end
 
+    # Prevents sql_log_normalizer DB extension from skipping the normalization.
+    def skip_logging?
+      return false if @loaded_extensions.include?(:sql_log_normalizer)
+      super
+    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.
-    def activerecord_lock
-      return yield if ActiveRecord.version < Gem::Version.new("5.1.0")
-
-      activerecord_connection.lock.synchronize do
-        ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-          yield
+    if ActiveRecord.version >= Gem::Version.new("5.1.0")
+      def activerecord_lock
+        activerecord_connection.lock.synchronize do
+          ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+            yield
+          end
         end
       end
+    else
+      def activerecord_lock
+        yield
+      end
     end
 
     def activerecord_connection
@@ -152,6 +160,16 @@ module Sequel
         &block
       )
     end
+
+    if ActiveRecord.version >= Gem::Version.new("7.0")
+      def activerecord_timezone
+        ActiveRecord.default_timezone
+      end
+    else
+      def activerecord_timezone
+        ActiveRecord::Base.default_timezone
+      end
+    end
   end
 
   Database.register_extension(:activerecord_connection, ActiveRecordConnection)

data/sequel-activerecord_connection.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "sequel-activerecord_connection"
-  spec.version       = "1.2.2"
+  spec.version       = "1.2.6"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 
@@ -9,15 +9,15 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/janko/sequel-activerecord_connection"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.3"
+  spec.required_ruby_version = ">= 2.4"
 
   spec.add_dependency "sequel", "~> 5.16"
-  spec.add_dependency "activerecord", ">= 4.2", "< 7"
-  spec.add_dependency "after_commit_everywhere", "~> 0.1.5"
+  spec.add_dependency "activerecord", ">= 4.2", "< 8"
+  spec.add_dependency "after_commit_everywhere", "~> 1.1"
 
   spec.add_development_dependency "sequel", "~> 5.38"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "warning" if RUBY_VERSION >= "2.4"
+  spec.add_development_dependency "warning"
 
   spec.files         = Dir["README.md", "LICENSE.txt", "CHANGELOG.md", "lib/**/*.rb", "*.gemspec"]
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.6
 platform: ruby
 authors:
 - Janko Marohnić
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -33,7 +33,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,21 +43,21 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: after_commit_everywhere
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ homepage: https://github.com/janko/sequel-activerecord_connection
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,15 +131,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Allows Sequel to use ActiveRecord connection for database interaction.
 test_files: []