sequel-activerecord_connection 1.2.1 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72a4a1bf22a4a83664c7925b1d0b78ee5d20777eb12ffec4df9bd4b0c60a9930
-  data.tar.gz: 58c32e5d224d136cb797453bd8ac70f40d964160c4996377909349c8bb324af5
+  metadata.gz: 2f7764c3c949cc68b34a38607264efa44915adcecca59514e5ecfda075f9e9d7
+  data.tar.gz: 273b77e0d95f1506765bd4ee88d79ec69639224b7d220b6d368d62bdfc7b665b
 SHA512:
-  metadata.gz: 7cc94ff1690360f805eec685404d9017b9df0f327c32110e54694dd1da148f1141990a468b69787896ea5e9a4b13d84c41783d4dcee0fd8b1f020defd9288961
-  data.tar.gz: b67647d492d7d31478ca6db7ba4b107914d8ba692bd41bf4596cab5f06a16ee62b2f19ab199dfce9566234ac876b349c212199a23cbec2c15884108cf1e41f79
+  metadata.gz: d32c90dbfc833db0c8f62ee72ef7a2d997e9c3d0b5e9f7e0dc817431a9e96cbb1e87542de0c828742a8068cfa5227ae8cf287931c6bcb05b6da87fd87b00c924
+  data.tar.gz: 174b89d5a19094c68549fb1112df0de767eb9ed77b1acd7e17114ac3af3637f47f95c46c3e98dace8b28123a473669ff17b04197ee3819c4a92a78cfa6f3a024

data/CHANGELOG.md

@@ -1,4 +1,28 @@
-## 1.2.1 (2020-01-10)
+## HEAD
+
+* 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)
+
+* Fix executing Active Record queries inside a Sequel transaction not working in mysql2 adapter (@janko)
+
+## 1.2.1 (2021-01-10)
 
 * Fix original mysql2 query options not being restored after nested `DB#synchronize` calls, e.g. when using Sequel transactions (@janko)
 

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

@@ -5,21 +5,26 @@ module Sequel
     module Mysql2
       def synchronize(*)
         super do |conn|
-          if conn.instance_variable_defined?(:@sequel_default_query_options)
-            return yield(conn)
-          end
-
           # required for prepared statements
-          conn.instance_variable_set(:@sequel_default_query_options, conn.query_options.dup)
           Utils.add_prepared_statements_cache(conn)
 
-          conn.query_options.merge!(as: :hash, symbolize_keys: true, cache_rows: false)
+          yield conn
+        end
+      end
+
+      private
+
+      def _execute(conn, sql, opts)
+        if conn.instance_variable_defined?(:@sequel_default_query_options)
+          return super
+        end
 
-          begin
-            yield conn
-          ensure
-            conn.query_options.replace(conn.remove_instance_variable(:@sequel_default_query_options))
-          end
+        conn.instance_variable_set(:@sequel_default_query_options, conn.query_options.dup)
+        conn.query_options.merge!(as: :hash, symbolize_keys: true, cache_rows: false)
+        begin
+          super
+        ensure
+          conn.query_options.replace(conn.remove_instance_variable(:@sequel_default_query_options))
         end
       end
     end

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

@@ -10,9 +10,7 @@ module Sequel
 
           Utils.add_prepared_statements_cache(conn)
 
-          Utils.set_value(conn, :type_map_for_results, PG::TypeMapAllStrings.new) do
-            yield conn
-          end
+          yield conn
         end
       end
 
@@ -84,7 +82,9 @@ module Sequel
         # Return the PG::Result containing the query results.
         def execute_query(sql, args)
           @db.log_connection_yield(sql, self, args) do
-            args ? async_exec_params(sql, args) : async_exec(sql)
+            Utils.set_value(self, :type_map_for_results, PG::TypeMapAllStrings.new) do
+              args ? async_exec_params(sql, args) : async_exec(sql)
+            end
           end
         end
       end

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

@@ -15,8 +15,16 @@ module Sequel
 
           Utils.add_prepared_statements_cache(conn)
 
+          yield conn
+        end
+      end
+
+      private
+
+      def _execute(type, sql, opts, &block)
+        synchronize(opts[:server]) do |conn|
           Utils.set_value(conn, :results_as_hash, nil) do
-            yield conn
+            super
           end
         end
       end

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,12 +118,18 @@ 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.
@@ -152,6 +156,16 @@ module Sequel
         &block
       )
     end
+
+    if ActiveRecord::VERSION::MAJOR >= 7
+      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.1"
+  spec.version       = "1.2.5"
   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.1
+  version: 1.2.5
 platform: ruby
 authors:
 - Janko Marohnić
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-12-18 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: []