sequel-activerecord_connection 0.3.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4078a41f54331cbb97fc266abdbe24cf8c297be14bb7f92b3bf605bf9b549bd
-  data.tar.gz: af466cd9b062279a7781106136a05151f02339830469136cdf9b58d629397b98
+  metadata.gz: fba99c145ebf98ed9c3e26fdc96afc3bc5fa7820e01d466ab10320c72765c8ae
+  data.tar.gz: ae36bef3a63280cf54f1a92e814c1bf4928dc8050f572694aac4340389115f9b
 SHA512:
-  metadata.gz: e28881de46188d6dc143952a473e00254b0742c497e7888e8d334ff33b627d3d90d9174675809cc3248b15cfcc800908bc83dda5a8da3fee93c4048c44282424
-  data.tar.gz: 7c0a46d18a45e76ca4a7af11d467b957035dd4b62adbdcaf64d8e9cafe1bfb406fa40c3d4feadff10c823d2535cab978111203ade32ea519f991e828ed1df033
+  metadata.gz: 073babf3f4e9d60dcb439eb0d9a7b801b9cf23b9be53366382cdd9e18234de66c329d0a975e68fb57d78cbf80f26ddafcd3f1bc90e8282a9a24b90cd1f8c0a43
+  data.tar.gz: 420a6326c6c0e0b85874b52c89e747a59702280e763d9f6a090dd649b17718771cefaa1d9d72d4244a92bcfbee7ff2c186480ad0005d17685abcd0a595ccb97c

data/CHANGELOG.md

@@ -1,3 +1,63 @@
+## 1.1.0 (2020-11-08)
+
+* Drop support for Ruby 2.2 (@janko)
+
+* Support transaction/savepoint hooks even when Active Record holds the transaction/savepoint (@janko)
+
+* Don't test the connection on `Sequel.connect` by default (@janko)
+
+## 1.0.1 (2020-10-28)
+
+* Use Active Record connection lock in `Database#synchronize` (@janko)
+
+## 1.0.0 (2020-10-25)
+
+* Clear AR statement cache on `ActiveRecord::PreparedStatementCacheExpired` when Sequel holds the transaction (@janko)
+
+* Pick up `ActiveRecord::Base.default_timezone` being changed on runtime (@janko)
+
+* Support prepared statements and bound variables in all adapters (@janko)
+
+* Correctly identify identity columns as primary keys in Postgres adapter (@janko)
+
+* Avoid using deprecated `sqlite3` API in SQLite adapter (@janko)
+
+* Allow using any external Active Record adapters (@janko)
+
+* Avoid potential bugs when converting Active Record exceptions into Sequel exceptions (@janko)
+
+* Don't use Active Record locks when executing queries with Sequel (@janko)
+
+* Support `Database#valid_connection?` in Postgres adapter (@janko)
+
+* Fully utilize Sequel's logic for detecting disconnects in Postgres adapter (@janko)
+
+* Support `Database#{copy_table,copy_into,listen}` in Postgres adapter (@janko)
+
+* Log all queries executed by Sequel (@janko)
+
+* Log executed queries to Sequel logger(s) as well (@janko)
+
+* Specially label queries executed by Sequel in Active Record logs (@janko)
+
+## 0.4.1 (2020-09-28)
+
+* Require Sequel version 5.16.0 or above (@janko)
+
+## 0.4.0 (2020-09-28)
+
+* Return correct result of `Database#in_transaction?` after ActiveRecord transaction exited (@janko)
+
+* Make ActiveRecord create a savepoint inside a Sequel transaction with `auto_savepoint: true` (@janko)
+
+* Make Sequel create a savepoint inside ActiveRecord transaction with `joinable: false` (@janko)
+
+* Improve reliability of nested transactions when combining Sequel and ActiveRecord (@janko)
+
+* Raise error when attempting to add an `after_commit`/`after_rollback` hook on ActiveRecord transaction (@janko)
+
+* Fix infinite loop that could happen with transactional Rails tests (@janko)
+
 ## 0.3.0 (2020-07-24)
 
 * Fully support Sequel transaction API (all transaction options, transaction/savepoint hooks etc.) (@janko)

data/README.md

@@ -1,25 +1,23 @@
-# Sequel::ActiveRecordConnection
+# sequel-activerecord_connection
 
 This is an extension for [Sequel] that allows it to reuse an existing
-ActiveRecord connection for database interaction. It works on ActiveRecord 4.2
-or higher, and supports the built-in `postgresql`, `mysql2` and `sqlite3`
-adapters, as well as JDBC adapter for JRuby.
+ActiveRecord connection for database interaction.
 
 This can be useful if you're using a library that uses Sequel for database
-interaction (e.g. [Rodauth]), but you want to avoid creating a separate
-database connection. Or if you're transitioning from ActiveRecord to Sequel,
-and want the database connection to be shared.
+interaction (e.g. [Rodauth] or [rom-sql]), but you want to avoid creating a
+separate database connection. Or if you're transitioning from ActiveRecord to
+Sequel, and want the database connection to be shared.
 
-Note that this is a best-effort implementation, so some discrepancies are still
-possible. That being said, this implementation passes Rodauth's test suite
-(for all adapters), which has some fairly advanced Sequel usage.
+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.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-```ruby
-gem "sequel-activerecord_connection", "~> 0.3"
+```rb
+gem "sequel-activerecord_connection", "~> 1.0"
 ```
 
 And then execute:
@@ -42,8 +40,7 @@ appropriate Sequel adapter and load the `activerecord_connection` extension:
 ```rb
 require "sequel"
 
-DB = Sequel.postgres(test: false) # avoid creating a connection
-DB.extension :activerecord_connection
+DB = Sequel.postgres(extensions: :activerecord_connection)
 ```
 
 Now any Sequel operations that you make will internaly be done using the
@@ -75,13 +72,17 @@ ActiveRecord adapters, just make sure to initialize the corresponding Sequel
 adapter before loading the extension.
 
 ```rb
-DB = Sequel.postgres(test: false) # for "postgresql" adapter
-# or
-DB = Sequel.mysql2(test: false) # for "mysql2" adapter
-# or
-DB = Sequel.sqlite(test: false) # for "sqlite3" adapter
-# or
-DB = Sequel.jdbc(test: false) # for JDBC adapter
+Sequel.postgres(extensions: :activerecord_connection) # for "postgresql" adapter
+Sequel.mysql2(extensions: :activerecord_connection)   # for "mysql2" adapter
+Sequel.sqlite(extensions: :activerecord_connection)   # for "sqlite3" adapter
+```
+
+If you're on JRuby, you should be using the JDBC adapters:
+
+```rb
+Sequel.connect("jdbc:postgresql://", extensions: :activerecord_connection) # for "jdbcpostgresql" adapter
+Sequel.connect("jdbc:mysql://", extensions: :activerecord_connection)      # for "jdbcmysql" adapter
+Sequel.connect("jdbc:sqlite://", extensions: :activerecord_connection)     # for "jdbcsqlite3" adapter
 ```
 
 ### Transactions
@@ -101,41 +102,77 @@ Sequel's transaction API is fully supported:
 
 ```rb
 DB.transaction(isolation: :serializable) do
-  DB.after_commit { ... } # call block after transaction commits
+  DB.after_commit { ... } # executed after transaction commits
   DB.transaction(savepoint: true) do # creates a savepoint
-    # ...
+    DB.after_commit(savepoint: true) { ... } # executed if all enclosing savepoints have been released
   end
 end
 ```
 
-One caveat to keep in mind is that Sequel's transaction hooks
-(`after_commit`, `after_rollback`) will *not* run if ActiveRecord holds the
-outer transaction:
+When combining Active Record and Sequel transactions, Sequel transaction hook
+functionality will be utilized when possible.
 
 ```rb
+# Sequel: An after_commit transaction hook will always get executed if the outer
+# transaction commits, even if it's added inside a savepoint that's rolled back.
 DB.transaction do
-  DB.after_commit { ... } # will get executed
-end
-
-ActiveRecord::Base.transaction do
-  DB.after_commit { ... } # won't get executed
+  ActiveRecord::Base.transaction(requires_new: true) do
+    DB.after_commit { puts "after commit" }
+    raise ActiveRecord::Rollback
+  end
 end
-
-ActiveRecord::Base.transaction do
+#>> BEGIN
+#>> SAVEPOINT active_record_1
+#>> ROLLBACK TO SAVEPOINT active_record_1
+#>> COMMIT
+#>> after commit
+
+# Sequel: An after_commit savepoint hook will get executed only after the outer
+# transaction commits, given that all enclosing savepoints have been released.
+DB.transaction(auto_savepoint: true) do
   DB.transaction do
-    DB.after_commit { ... } # won't get executed
+    DB.after_commit(savepoint: true) { puts "after commit" }
+    raise Sequel::Rollback
   end
 end
+#>> BEGIN
+#>> SAVEPOINT active_record_1
+#>> RELEASE SAVEPOINT active_record_1
+#>> COMMIT
+#>> after commit
 ```
 
-Savepoint hooks should still work, though:
+In case of (a) adding a transaction hook while Active Record holds the
+transaction, or (b) adding a savepoint hook when Active Record holds any
+enclosing savepoint, Active Record transaction callbacks will be used instead
+of Sequel hooks, which have slightly different behaviour in some circumstances.
 
 ```rb
+# ActiveRecord: An after_commit transaction callback is not executed if any
+# if the enclosing savepoints have been rolled back
 ActiveRecord::Base.transaction do
   DB.transaction(savepoint: true) do
-    DB.after_commit { ... } # will get executed after savepoint is released
+    DB.after_commit { puts "after commit" }
+    raise Sequel::Rollback
   end
 end
+#>> BEGIN
+#>> SAVEPOINT active_record_1
+#>> ROLLBACK TO SAVEPOINT active_record_1
+#>> COMMIT
+
+# ActiveRecord: An after_commit transaction callback can be executed already
+# after a savepoint is released, if the enclosing transaction is not joinable.
+ActiveRecord::Base.transaction(joinable: false) do
+  DB.transaction do
+    DB.after_commit { puts "after commit" }
+  end
+end
+#>> BEGIN
+#>> SAVEPOINT active_record_1
+#>> RELEASE SAVEPOINT active_record_1
+#>> after commit
+#>> COMMIT
 ```
 
 ### Model
@@ -153,19 +190,6 @@ end
 DB.activerecord_model = MyModel
 ```
 
-### Timezone
-
-Sequel's database timezone will be automatically set to ActiveRecord's default
-timezone (`:utc` by default) when the extension is loaded.
-
-If you happen to be changing ActiveRecord's default timezone after you've
-loaded the extension, make sure to reflect that in your Sequel database object,
-for example:
-
-```rb
-DB.timezone = :local
-```
-
 ## Tests
 
 You'll first want to run the rake tasks for setting up databases and users:
@@ -198,3 +222,4 @@ 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

data/lib/sequel/extensions/activerecord_connection.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "after_commit_everywhere"
+
 module Sequel
   module ActiveRecordConnection
     Error = Class.new(Sequel::Error)
@@ -9,15 +13,17 @@ module Sequel
       serializable: :serializable,
     }
 
+    ACTIVERECORD_CALLBACKS = Object.new.extend(AfterCommitEverywhere)
+
     def self.extended(db)
       db.activerecord_model = ActiveRecord::Base
-      db.timezone = ActiveRecord::Base.default_timezone
+      db.opts[:test] = false unless db.opts.key?(:test)
 
       begin
         require "sequel/extensions/activerecord_connection/#{db.adapter_scheme}"
         db.extend Sequel::ActiveRecordConnection.const_get(db.adapter_scheme.capitalize)
       rescue LoadError
-        fail Error, "unsupported adapter: #{db.adapter_scheme}"
+        # assume the Sequel adapter already works with Active Record
       end
     end
 
@@ -28,79 +34,141 @@ module Sequel
       raise Error, "creating a Sequel connection is not allowed"
     end
 
-    # Avoid calling Sequel's connection pool, instead use ActiveRecord.
+    # Avoid calling Sequel's connection pool, instead use Active Record's.
     def synchronize(*)
-      if ActiveRecord.version >= Gem::Version.new("5.1.0")
-        activerecord_connection.lock.synchronize do
-          yield activerecord_raw_connection
-        end
-      else
-        yield activerecord_raw_connection
+      activerecord_lock do
+        yield activerecord_connection.raw_connection
       end
     end
 
+    # Log executed queries into Active Record logger as well.
+    def log_connection_yield(sql, conn, args = nil)
+      sql += "; #{args.inspect}" if args
+
+      activerecord_log(sql) { super }
+    end
+
+    # Match database timezone with Active Record.
+    def timezone
+      @timezone || ActiveRecord::Base.default_timezone
+    end
+
     private
 
-    # Backfills any ActiveRecord transactions/savepoints that have been opened
-    # directly via ActiveRecord::Base.transaction. Sequel uses this information
-    # to know whether we're in a transaction, whether to create a savepoint,
-    # when to run transaction/savepoint hooks etc.
+    # Synchronizes transaction state with ActiveRecord. Sequel uses this
+    # information to know whether we're in a transaction, whether to create a
+    # savepoint, when to run transaction/savepoint hooks etc.
     def _trans(conn)
-      Sequel.synchronize do
-        result = @transactions[conn]
-
-        if activerecord_connection.transaction_open?
-          result ||= { savepoints: [] }
-          while result[:savepoints].length < activerecord_connection.open_transactions
-            result[:savepoints].unshift({ activerecord: true })
-          end
-        end
+      hash = super || { savepoints: [], activerecord: true }
 
-        @transactions[conn] = result if result
-        result
+      # add any ActiveRecord transactions/savepoints that have been opened
+      # directly via ActiveRecord::Base.transaction
+      while hash[:savepoints].length < activerecord_connection.open_transactions
+        hash[:savepoints] << { activerecord: true }
+      end
+
+      # remove any ActiveRecord transactions/savepoints that have been closed
+      # directly via ActiveRecord::Base.transaction
+      while hash[:savepoints].length > activerecord_connection.open_transactions && hash[:savepoints].last[:activerecord]
+        hash[:savepoints].pop
+      end
+
+      # sync knowledge about joinability of current ActiveRecord transaction/savepoint
+      if activerecord_connection.transaction_open? && !activerecord_connection.current_transaction.joinable?
+        hash[:savepoints].last[:auto_savepoint] = true
+      end
+
+      if hash[:savepoints].empty? && hash[:activerecord]
+        Sequel.synchronize { @transactions.delete(conn) }
+      else
+        Sequel.synchronize { @transactions[conn] = hash }
       end
-    end
 
-    # First delete any transactions/savepoints opened directly via
-    # ActiveRecord::Base.transaction, so that Sequel can detect when the last
-    # Sequel transaction has been closed and clear transaction information.
-    def transaction_finished?(conn)
-      _trans(conn)[:savepoints].shift while _trans(conn)[:savepoints].first[:activerecord]
       super
     end
 
-    def begin_transaction(conn, opts = {})
+    def begin_transaction(conn, opts = OPTS)
       isolation = TRANSACTION_ISOLATION_MAP.fetch(opts[:isolation]) if opts[:isolation]
+      joinable  = !opts[:auto_savepoint]
 
-      activerecord_connection.begin_transaction(isolation: isolation)
+      activerecord_connection.begin_transaction(isolation: isolation, joinable: joinable)
     end
 
-    def commit_transaction(conn, opts = {})
+    def commit_transaction(conn, opts = OPTS)
       activerecord_connection.commit_transaction
     end
 
-    def rollback_transaction(conn, opts = {})
+    def rollback_transaction(conn, opts = OPTS)
       activerecord_connection.rollback_transaction
-      activerecord_connection.transaction_manager.send(:after_failure_actions, activerecord_connection.current_transaction, $!) if activerecord_connection.transaction_manager.respond_to?(:after_failure_actions)
     end
 
-    def savepoint_level(conn)
-      activerecord_connection.open_transactions
+    # When Active Record holds the transaction, we cannot use Sequel hooks,
+    # because Sequel doesn't have knowledge of when the transaction is
+    # committed. So in this case we register an Active Record hook using the
+    # after_commit_everywhere gem.
+    def add_transaction_hook(conn, type, block)
+      if _trans(conn)[:activerecord]
+        ACTIVERECORD_CALLBACKS.public_send(type, &block)
+      else
+        super
+      end
     end
 
-    def activerecord_raw_connection
-      activerecord_connection.raw_connection
+    # When Active Record holds the savepoint, we cannot use Sequel hooks,
+    # because Sequel doesn't have knowledge of when the savepoint is
+    # released. So in this case we register an Active Record hook using the
+    # after_commit_everywhere gem.
+    def add_savepoint_hook(conn, type, block)
+      if _trans(conn)[:savepoints].last[:activerecord]
+        ACTIVERECORD_CALLBACKS.public_send(type, &block)
+      else
+        super
+      end
+    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.
+    def activerecord_lock
+      return yield if ActiveRecord.version < Gem::Version.new("5.1.0")
+
+      activerecord_connection.lock.synchronize do
+        ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+          yield
+        end
+      end
     end
 
     def activerecord_connection
       activerecord_model.connection
     end
 
-    def activesupport_interlock(&block)
-      if ActiveSupport::Dependencies.respond_to?(:interlock)
-        ActiveSupport::Dependencies.interlock.permit_concurrent_loads(&block)
-      else
+    def activerecord_log(sql, &block)
+      ActiveSupport::Notifications.instrument(
+        "sql.active_record",
+        sql:        sql,
+        name:       "Sequel",
+        connection: activerecord_connection,
+        &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

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

@@ -7,32 +7,11 @@ module Sequel
         end
       end
 
-      def statement(conn)
-        stmt = activerecord_raw_connection.connection.createStatement
-        yield stmt
-      rescue ActiveRecord::StatementInvalid => exception
-        raise_error(exception.cause, classes: database_error_classes)
-      rescue *database_error_classes => e
-        raise_error(e, classes: database_error_classes)
-      ensure
-        stmt.close if stmt
-      end
-
-      def execute(sql, opts=OPTS)
-        activerecord_connection.send(:log, sql) do
-          super
-        end
-      rescue ActiveRecord::StatementInvalid => exception
-        raise_error(exception.cause, classes: database_error_classes)
-      end
-
-      def execute_dui(sql, opts=OPTS)
-        activerecord_connection.send(:log, sql) do
-          super
+      def synchronize(*)
+        super do |conn|
+          yield conn.connection
         end
-      rescue ActiveRecord::StatementInvalid => exception
-        raise_error(exception.cause, classes: database_error_classes)
       end
     end
   end
-end
+end

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

@@ -1,34 +1,20 @@
 module Sequel
   module ActiveRecordConnection
     module Mysql2
-      def execute(sql, opts=OPTS)
-        original_query_options = activerecord_raw_connection.query_options.dup
+      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)
 
-        activerecord_raw_connection.query_options.merge!(
-          as:             :hash,
-          symbolize_keys: true,
-          cache_rows:     false,
-        )
+          conn.query_options.merge!(as: :hash, symbolize_keys: true, cache_rows: false)
 
-        result = activerecord_connection.execute(sql)
-
-        if opts[:type] == :select
-          if block_given?
-            yield result
-          else
-            result
+          begin
+            yield conn
+          ensure
+            conn.query_options.replace(conn.instance_variable_get(:@sequel_default_query_options))
           end
-        elsif block_given?
-          yield activerecord_raw_connection
-        end
-      rescue ActiveRecord::StatementInvalid => exception
-        if exception.cause.is_a?(::Mysql2::Error)
-          raise_error(exception.cause)
-        else
-          raise
         end
-      ensure
-        activerecord_raw_connection.query_options.replace(original_query_options)
       end
     end
   end

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

@@ -1,28 +1,98 @@
 module Sequel
   module ActiveRecordConnection
     module Postgres
-      def execute(sql, opts=OPTS)
-        result = activerecord_connection.execute(sql)
+      def synchronize(*)
+        super do |conn|
+          conn.extend(ConnectionMethods)
+          conn.instance_variable_set(:@db, self)
 
-        if block_given?
-          yield result
-        else
-          result.cmd_tuples
+          Utils.add_prepared_statements_cache(conn)
+
+          Utils.set_value(conn, :type_map_for_results, PG::TypeMapAllStrings.new) do
+            yield conn
+          end
         end
-      rescue ActiveRecord::PreparedStatementCacheExpired
-        raise # ActiveRecord's transaction manager needs to handle this exception
-      rescue ActiveRecord::StatementInvalid => exception
-        raise_error(exception.cause, classes: database_error_classes)
-      ensure
-        result.clear if result
       end
 
-      def transaction(options = {})
+      # Reject unsupported Postgres-specific transaction options.
+      def transaction(opts = OPTS)
         %i[deferrable read_only synchronous].each do |key|
-          fail Error, "#{key.inspect} transaction option is currently not supported" if options.key?(key)
+          fail Error, "#{key.inspect} transaction option is currently not supported" if opts.key?(key)
         end
 
         super
+      rescue => e
+        activerecord_connection.clear_cache! if e.class.name == "ActiveRecord::PreparedStatementCacheExpired" && !in_transaction?
+        raise
+      end
+
+      # Copy-pasted from Sequel::Postgres::Adapter.
+      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
+
+        # 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() "
+         ])}/
+
+        def async_exec_params(sql, args)
+          defined?(super) ? super : async_exec(sql, args)
+        end
+
+        # Raise a Sequel::DatabaseDisconnectError if a one of the disconnect
+        # error classes is raised, or a PG::Error is raised and the connection
+        # status cannot be determined or it is not OK.
+        def check_disconnect_errors
+          begin
+            yield
+          rescue *DISCONNECT_ERROR_CLASSES => e
+            disconnect = true
+            raise(Sequel.convert_exception_class(e, Sequel::DatabaseDisconnectError))
+          rescue PG::Error => e
+            disconnect = false
+            begin
+              s = status
+            rescue PG::Error
+              disconnect = true
+            end
+            status_ok = (s == PG::CONNECTION_OK)
+            disconnect ||= !status_ok
+            disconnect ||= e.message =~ DISCONNECT_ERROR_REGEX
+            disconnect ? raise(Sequel.convert_exception_class(e, Sequel::DatabaseDisconnectError)) : raise
+          ensure
+            block if status_ok && !disconnect
+          end
+        end
+
+        # Execute the given SQL with this connection.  If a block is given,
+        # yield the results, otherwise, return the number of changed rows.
+        def execute(sql, args = nil)
+          args   = args.map { |v| @db.bound_variable_arg(v, self) } if args
+          result = check_disconnect_errors { execute_query(sql, args) }
+
+          block_given? ? yield(result) : result.cmd_tuples
+        ensure
+          result.clear if result
+        end
+
+        private
+
+        # 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)
+          end
+        end
       end
     end
   end

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

@@ -7,43 +7,16 @@ module Sequel
         end
       end
 
-      def execute_ddl(sql, opts=OPTS)
-        execute(sql, opts)
-      end
-
-      private
-
-      # ActiveRecord doesn't send SQLite methods Sequel expects, so we need to
-      # try to replicate what ActiveRecord does around connection excecution.
-      def _execute(type, sql, opts, &block)
-        if activerecord_raw_connection.respond_to?(:extended_result_codes=)
-          activerecord_raw_connection.extended_result_codes = true
-        end
+      def synchronize(*)
+        super do |conn|
+          conn.extended_result_codes = true if conn.respond_to?(:extended_result_codes=)
 
-        if ActiveRecord::VERSION::MAJOR >= 6
-          activerecord_connection.materialize_transactions
-        end
+          Utils.add_prepared_statements_cache(conn)
 
-        activerecord_connection.send(:log, sql) do
-          activesupport_interlock do
-            case type
-            when :select
-              activerecord_raw_connection.query(sql, &block)
-            when :insert
-              activerecord_raw_connection.execute(sql)
-              activerecord_raw_connection.last_insert_row_id
-            when :update
-              activerecord_raw_connection.execute_batch(sql)
-              activerecord_raw_connection.changes
-            end
+          Utils.set_value(conn, :results_as_hash, nil) do
+            yield conn
           end
         end
-      rescue ActiveRecord::StatementInvalid => exception
-        if exception.cause.is_a?(SQLite3::Exception)
-          raise_error(exception.cause)
-        else
-          raise exception
-        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       = "0.3.0"
+  spec.version       = "1.1.0"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 
@@ -9,12 +9,15 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/janko/sequel-activerecord_connection"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.2.0")
+  spec.required_ruby_version = ">= 2.3"
 
-  spec.add_dependency "sequel", ">= 4.0", "< 6"
+  spec.add_dependency "sequel", "~> 5.16"
   spec.add_dependency "activerecord", ">= 4.2", "< 7"
+  spec.add_dependency "after_commit_everywhere", "~> 0.1.5"
 
+  spec.add_development_dependency "sequel", "~> 5.38"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "warning" if RUBY_VERSION >= "2.4"
 
   spec.files         = Dir["README.md", "LICENSE.txt", "CHANGELOG.md", "lib/**/*.rb", "*.gemspec"]
   spec.require_paths = ["lib"]

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2020-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +44,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: after_commit_everywhere
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.38'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.38'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: warning
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows Sequel to use ActiveRecord connection for database interaction.
 email:
 - janko.marohnic@gmail.com
@@ -92,14 +128,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Allows Sequel to use ActiveRecord connection for database interaction.