sequel-activerecord_connection 1.2.0 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee4a6a5b6dcfceb9856ca13e48cd47ce2573f9d5f4d8923518854eb0651c1cb9
-  data.tar.gz: 18fd0ce3a56b87b102e6534eef4ae478d1a2df10a4aac8ae984fa4069c477493
+  metadata.gz: 9d73b44077fae26fe7a6fccac31b4884b377c145c23cfd39f39c70666b71580a
+  data.tar.gz: 9db866222fa1aabb42e6b356d3fa04eeb3cf7a4e5982218abbb1002df5fbaefc
 SHA512:
-  metadata.gz: dd33df7445d400b75b29782c99f83d1afc8fc93338eeab4fd0196c4281e34fc1df21d12a0e1a8ccd130995527bef95d7b3ca1b9b16f47a33623b750842b68732
-  data.tar.gz: c4e26c97e37efd8f8415c7c03799bdde385a478384531948b60837d43bb1f09e7a9feb899b2d080aa20d41f6fb152adfe236aaf0447a1140637696baecd1b1a7
+  metadata.gz: 01c5c7b4c437cd28b532d9b39bf5598afa47699cdb05cc3cc5ac51efb620c59af3b7936cedcccac999b1ccae8062fa903b2fa56b9b6bc0c2fa3e941cc97dd4fc
+  data.tar.gz: 296510c5a357a16bb8b7cafeccac2f28b1b0a59175927b387b80c9684bf8d45921f7c870c39a766d2b190ac30cb3cdba735c2a9b09260a8b3bb9a05c6db2709a

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 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)
+
 ## 1.2.0 (2020-11-15)
 
 * Attempt support for [activerecord-sqlserver-adapter](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter) (@janko)

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

@@ -6,16 +6,25 @@ module Sequel
       def synchronize(*)
         super do |conn|
           # 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.instance_variable_get(:@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
 
@@ -32,20 +30,12 @@ module Sequel
       module ConnectionMethods
         # The underlying exception classes to reraise as disconnect errors
         # instead of regular database errors.
-        DISCONNECT_ERROR_CLASSES = [IOError, Errno::EPIPE, Errno::ECONNRESET, ::PG::ConnectionBad].freeze
+        DISCONNECT_ERROR_CLASSES = Sequel::Postgres::Adapter::DISCONNECT_ERROR_CLASSES
 
         # Since exception class based disconnect checking may not work,
         # also trying parsing the exception message to look for disconnect
         # errors.
-        DISCONNECT_ERROR_REGEX = /\A#{Regexp.union([
-          "ERROR:  cached plan must not change result type",
-          "could not receive data from server",
-          "no connection to the server",
-          "connection not open",
-          "connection is closed",
-          "terminating connection due to administrator command",
-          "PQconsumeInput() "
-         ])}/
+        DISCONNECT_ERROR_REGEX = Sequel::Postgres::Adapter::DISCONNECT_ERROR_RE
 
         def async_exec_params(sql, args)
           defined?(super) ? super : async_exec(sql, args)
@@ -92,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,7 +118,7 @@ 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
@@ -152,6 +150,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.0"
+  spec.version       = "1.2.4"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 
@@ -12,8 +12,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.3"
 
   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", "< 7.1"
+  spec.add_dependency "after_commit_everywhere", "~> 1.1"
 
   spec.add_development_dependency "sequel", "~> 5.38"
   spec.add_development_dependency "minitest"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.4
 platform: ruby
 authors:
 - Janko Marohnić
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2021-09-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: '7.1'
   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: '7.1'
 - !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
@@ -138,8 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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: []