sequel-activerecord_connection 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee4a6a5b6dcfceb9856ca13e48cd47ce2573f9d5f4d8923518854eb0651c1cb9
-  data.tar.gz: 18fd0ce3a56b87b102e6534eef4ae478d1a2df10a4aac8ae984fa4069c477493
+  metadata.gz: 72a4a1bf22a4a83664c7925b1d0b78ee5d20777eb12ffec4df9bd4b0c60a9930
+  data.tar.gz: 58c32e5d224d136cb797453bd8ac70f40d964160c4996377909349c8bb324af5
 SHA512:
-  metadata.gz: dd33df7445d400b75b29782c99f83d1afc8fc93338eeab4fd0196c4281e34fc1df21d12a0e1a8ccd130995527bef95d7b3ca1b9b16f47a33623b750842b68732
-  data.tar.gz: c4e26c97e37efd8f8415c7c03799bdde385a478384531948b60837d43bb1f09e7a9feb899b2d080aa20d41f6fb152adfe236aaf0447a1140637696baecd1b1a7
+  metadata.gz: 7cc94ff1690360f805eec685404d9017b9df0f327c32110e54694dd1da148f1141990a468b69787896ea5e9a4b13d84c41783d4dcee0fd8b1f020defd9288961
+  data.tar.gz: b67647d492d7d31478ca6db7ba4b107914d8ba692bd41bf4596cab5f06a16ee62b2f19ab199dfce9566234ac876b349c212199a23cbec2c15884108cf1e41f79

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.1 (2020-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

@@ -5,6 +5,10 @@ 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)
@@ -14,7 +18,7 @@ module Sequel
           begin
             yield conn
           ensure
-            conn.query_options.replace(conn.instance_variable_get(:@sequel_default_query_options))
+            conn.query_options.replace(conn.remove_instance_variable(:@sequel_default_query_options))
           end
         end
       end

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

@@ -32,20 +32,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)

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.1"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 

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.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel