sequel-activerecord_connection 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72a4a1bf22a4a83664c7925b1d0b78ee5d20777eb12ffec4df9bd4b0c60a9930
-  data.tar.gz: 58c32e5d224d136cb797453bd8ac70f40d964160c4996377909349c8bb324af5
+  metadata.gz: 4bb2b81760b45990a9bea2801f8a243cfc180853ad450d652cf888cd45844033
+  data.tar.gz: 73ae4c6341a3c694423b4e20da86f01cce3324d37a9a29143eb2f2e420d45288
 SHA512:
-  metadata.gz: 7cc94ff1690360f805eec685404d9017b9df0f327c32110e54694dd1da148f1141990a468b69787896ea5e9a4b13d84c41783d4dcee0fd8b1f020defd9288961
-  data.tar.gz: b67647d492d7d31478ca6db7ba4b107914d8ba692bd41bf4596cab5f06a16ee62b2f19ab199dfce9566234ac876b349c212199a23cbec2c15884108cf1e41f79
+  metadata.gz: 4e27142472fabc36703d3cca6828e005858d60088a88bbb8f78c58dba5f6e9a2b2ae349ff6d39451558d7dd3e4e32e92d49818af88af9bb6bc18a522c283bc38
+  data.tar.gz: 6dff47d6fe0adf995dc3738e932bda92b15279b56bdf22750e6c42058031ca2b2f152e26cd80b2a09e3be460a1be8695a3645df8a2bcd4a87430ebfc3243fa98

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 1.2.1 (2020-01-10)
+## 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/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.2"
   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.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel