sequel-activerecord_connection 1.1.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fba99c145ebf98ed9c3e26fdc96afc3bc5fa7820e01d466ab10320c72765c8ae
-  data.tar.gz: ae36bef3a63280cf54f1a92e814c1bf4928dc8050f572694aac4340389115f9b
+  metadata.gz: f0de933805c130dcc42783bcf606f70e99a00346e58286d3bdfbb94ae8922c09
+  data.tar.gz: b60f70b511d83bbac70bcf6a48c99a20af23d58cc6f9d787db0cfccb11a67f85
 SHA512:
-  metadata.gz: 073babf3f4e9d60dcb439eb0d9a7b801b9cf23b9be53366382cdd9e18234de66c329d0a975e68fb57d78cbf80f26ddafcd3f1bc90e8282a9a24b90cd1f8c0a43
-  data.tar.gz: 420a6326c6c0e0b85874b52c89e747a59702280e763d9f6a090dd649b17718771cefaa1d9d72d4244a92bcfbee7ff2c186480ad0005d17685abcd0a595ccb97c
+  metadata.gz: 4b1f0f3f9f287609eb9f38ea215bdb873624cd4a66ea17c15867ae6a47808902330beaf4c1be09eb459e0b681daffb829812aa7125a4d565aab050e0df4c74ae
+  data.tar.gz: 3647bec71180cf1af65b8379fcfc6eb924b8fffbd4a575a97399e0a9096e77afbc3f1863095c6ce229a05c81b559a2a63a59df91c46cd4bb47d73c10e57c0b4b

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 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)
+
+* Attempt support for [oracle-enhanced](https://github.com/rsim/oracle-enhanced) Active Record adapter (@janko)
+
 ## 1.1.0 (2020-11-08)
 
 * Drop support for Ruby 2.2 (@janko)

data/README.md

@@ -9,8 +9,10 @@ separate database connection. Or if you're transitioning from ActiveRecord to
 Sequel, and want the database connection to be shared.
 
 It works on ActiveRecord 4.2+ and fully supports PostgresSQL, MySQL and SQLite
-adapters, both the native ones and JDBC (JRuby). Other adapters might work too,
-but their integration hasn't been tested.
+adapters, both the native ones and JDBC (JRuby). There is attempted suppport
+for [Oracle enhanced] and [SQL Server] Active Record adapters (`oracle` and
+`tinytds` in Sequel). Other adapters might work too, but their integration
+hasn't been tested.
 
 ## Installation
 
@@ -109,8 +111,9 @@ DB.transaction(isolation: :serializable) do
 end
 ```
 
-When combining Active Record and Sequel transactions, Sequel transaction hook
-functionality will be utilized when possible.
+When registering transaction hooks, they will be registered on Sequel
+transactions when possible, in which case they will behave as described in the
+[Sequel docs][sequel transaction hooks].
 
 ```rb
 # Sequel: An after_commit transaction hook will always get executed if the outer
@@ -223,3 +226,6 @@ Everyone interacting in this project's codebases, issue trackers, chat rooms and
 [Sequel]: https://github.com/jeremyevans/sequel
 [Rodauth]: https://github.com/jeremyevans/rodauth
 [rom-sql]: https://github.com/rom-rb/rom-sql
+[sequel transaction hooks]: http://sequel.jeremyevans.net/rdoc/files/doc/transactions_rdoc.html#label-Transaction+Hooks
+[Oracle enhanced]: https://github.com/rsim/oracle-enhanced
+[SQL Server]: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter

data/lib/sequel/extensions/activerecord_connection.rb

@@ -152,25 +152,6 @@ module Sequel
         &block
       )
     end
-
-    module Utils
-      def self.set_value(object, name, new_value)
-        original_value = object.send(name)
-        object.send(:"#{name}=", new_value)
-        yield
-      ensure
-        object.send(:"#{name}=", original_value)
-      end
-
-      def self.add_prepared_statements_cache(conn)
-        return if conn.respond_to?(:prepared_statements)
-
-        class << conn
-          attr_accessor :prepared_statements
-        end
-        conn.prepared_statements = {}
-      end
-    end
   end
 
   Database.register_extension(:activerecord_connection, ActiveRecordConnection)

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

@@ -9,7 +9,11 @@ module Sequel
 
       def synchronize(*)
         super do |conn|
-          yield conn.connection
+          if database_type == :oracle
+            yield conn.raw_connection
+          else
+            yield conn.connection
+          end
         end
       end
     end

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

@@ -1,19 +1,30 @@
+require_relative "utils"
+
 module Sequel
   module ActiveRecordConnection
     module Mysql2
       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/oracle.rb

@@ -0,0 +1,16 @@
+require_relative "utils"
+
+module Sequel
+  module ActiveRecordConnection
+    module Oracle
+      def synchronize(*)
+        super do |conn|
+          # required for prepared statements
+          Utils.add_prepared_statements_cache(conn.raw_oci_connection)
+
+          yield conn.raw_oci_connection
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require_relative "utils"
+
 module Sequel
   module ActiveRecordConnection
     module Postgres
@@ -8,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
 
@@ -30,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)
@@ -90,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

@@ -1,3 +1,5 @@
+require_relative "utils"
+
 module Sequel
   module ActiveRecordConnection
     module Sqlite
@@ -13,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/tinytds.rb

@@ -0,0 +1,19 @@
+require_relative "utils"
+
+module Sequel
+  module ActiveRecordConnection
+    module Tinytds
+      def synchronize(*)
+        super do |conn|
+          conn.query_options.merge!(cache_rows: false)
+
+          begin
+            yield conn
+          ensure
+            conn.query_options.merge!(cache_rows: true)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Sequel
+  module ActiveRecordConnection
+    module Utils
+      def self.set_value(object, name, new_value)
+        original_value = object.send(name)
+        object.send(:"#{name}=", new_value)
+        yield
+      ensure
+        object.send(:"#{name}=", original_value)
+      end
+
+      def self.add_prepared_statements_cache(conn)
+        return if conn.respond_to?(:prepared_statements)
+
+        class << conn
+          attr_accessor :prepared_statements
+        end
+        conn.prepared_statements = {}
+      end
+    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.1.0"
+  spec.version       = "1.2.3"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
 
   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 "after_commit_everywhere", "~> 1.0"
 
   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.1.0
+  version: 1.2.3
 platform: ruby
 authors:
 - Janko Marohnić
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-08 00:00:00.000000000 Z
+date: 2021-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -113,14 +113,17 @@ files:
 - lib/sequel/extensions/activerecord_connection.rb
 - lib/sequel/extensions/activerecord_connection/jdbc.rb
 - lib/sequel/extensions/activerecord_connection/mysql2.rb
+- lib/sequel/extensions/activerecord_connection/oracle.rb
 - lib/sequel/extensions/activerecord_connection/postgres.rb
 - lib/sequel/extensions/activerecord_connection/sqlite.rb
+- lib/sequel/extensions/activerecord_connection/tinytds.rb
+- lib/sequel/extensions/activerecord_connection/utils.rb
 - sequel-activerecord_connection.gemspec
 homepage: https://github.com/janko/sequel-activerecord_connection
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,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: []