sequel-activerecord_connection 1.2.3 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0de933805c130dcc42783bcf606f70e99a00346e58286d3bdfbb94ae8922c09
-  data.tar.gz: b60f70b511d83bbac70bcf6a48c99a20af23d58cc6f9d787db0cfccb11a67f85
+  metadata.gz: 4618dbde61b958267d7aa3b2e5e8c18d2dfd55207c8dcb9b3a0a9db4c8ca4b2b
+  data.tar.gz: 1c84a6e396817472d844739c24046df8cf83d6488a1a95f948677be228e05b13
 SHA512:
-  metadata.gz: 4b1f0f3f9f287609eb9f38ea215bdb873624cd4a66ea17c15867ae6a47808902330beaf4c1be09eb459e0b681daffb829812aa7125a4d565aab050e0df4c74ae
-  data.tar.gz: 3647bec71180cf1af65b8379fcfc6eb924b8fffbd4a575a97399e0a9096e77afbc3f1863095c6ce229a05c81b559a2a63a59df91c46cd4bb47d73c10e57c0b4b
+  metadata.gz: ae70b61b0f8b94d8eb6130c281515c490b9e80794d6081797a55a216f03296a5531d0993c09997603ac20d4eb7d448f5880e650f231f1968d159f9331ecd50d1
+  data.tar.gz: 1789fc025d079f5415d11f08590b00e7e9ff322587160c7ab9d123d1ceb598fd315ad730ed4642d99b51c80ba34fb386a5c507c0bf6d3c909ce0232bbc7e8852

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 1.2.7 (2022-01-20)
+
+* Require Sequel 3.38+ (@janko)
+
+## 1.2.6 (2021-12-26)
+
+* Speed up connection access 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)

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Janko Marohnić
+Copyright (c) 2020-2022 Janko Marohnić
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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.3"
+  spec.version       = "1.2.7"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 
@@ -9,15 +9,14 @@ 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", "~> 1.0"
+  spec.add_dependency "sequel", "~> 5.38"
+  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.3
+  version: 1.2.7
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-17 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.16'
+        version: '5.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.16'
+        version: '5.38'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -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,35 +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: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.38'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.38'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +117,7 @@ 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:
   - - ">="