sequel-activerecord_connection 0.2.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f7d0993543eb478053e24dbbde84de0aaefdb13eb03a8852dd7d8f7facd2532
-  data.tar.gz: 104318c5d02c0731e945dd3022b109902cdf2f97176b71511d06e68b4bbf8a10
+  metadata.gz: 929f5047395464d1d3616aeab41742b6766ae14b96ca1f5b7ac47bb1991f3391
+  data.tar.gz: c931c23d71b73ce2bb35118e1d02ecc2df529f2c297b995c9c5ee46c5b0bfe85
 SHA512:
-  metadata.gz: d70812ee57dc9225683adfe196a2bc0f72de24e38cbd2d9492317073ed50a97ed58294a718d799655d953f9b80fc37dd27af78566d9f2bfaf9b95c454faa7a6d
-  data.tar.gz: b7ec97e1c602bd544df1fba4c0a554846100ac1daed3e866d8ba837ca20b68f9b44f0f89db3a97d6c5e166a80e8276d1c30159453626af5692c8f78401cd2e54
+  metadata.gz: 062f919b4268a57e392bad5dd7d4a988adc90a8df2d4076f5abfa9afe7c125534f9e7ad1ca16733d0539e622f2b988f95d4653d6b076cd356809d95daf1c24d2
+  data.tar.gz: 1f1efabd6b3ae74c6d35b3d0a23ad87a9d1c939e209afc2f24267840c6c72b2ff60fb1ca86010335b65a251c3c57fa81b300aa4cf38b9ad49df53b00f931d89f

data/CHANGELOG.md

@@ -1,3 +1,61 @@
+## 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)
+
+## 0.2.6 (2020-07-19)
+
+* Return block result in `Sequel::Database#transaction` (@zabolotnov87, @janko)
+
+* Fix `Sequel::Model#save_changes` or `#save` with additional options not executing (@zabolotnov87, @janko)
+
 ## 0.2.5 (2020-06-04)
 
 * Use `#current_timestamp_utc` for the JDBC SQLite adapter as well (@HoneyryderChuck)

data/README.md

@@ -3,7 +3,7 @@
 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.
+adapters, as well as JDBC adapter for JRuby.
 
 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
@@ -11,15 +11,15 @@ 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 fairly advanced Sequel usage.
+possible. That being said, this implementation passes Rodauth's test suite
+(for all adapters), which has some fairly advanced Sequel usage.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "sequel-activerecord_connection"
+gem "sequel-activerecord_connection", "~> 0.3"
 ```
 
 And then execute:
@@ -42,8 +42,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,70 +74,68 @@ 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
+Sequel.postgres(extensions: :activerecord_connection) # for "postgresql" adapter
+Sequel.mysql2(extensions: :activerecord_connection)   # for "mysql2" adapter
+Sequel.sqlite(extensions: :activerecord_connection)   # for "sqlite3" adapter
 ```
 
-### Transactions
-
-The database extension overrides Sequel transactions to use ActiveRecord
-transcations, which allows using ActiveRecord inside Sequel transactions (and
-vice-versa), and have things like ActiveRecord's transactional callbacks still
-work correctly.
+If you're on JRuby, you should be using the JDBC adapters:
 
 ```rb
-DB.transaction do
-  ActiveRecord::Base.transaction do
-    # this all works
-  end
-end
+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
 ```
 
-The following Sequel transaction options are currently supported:
+### Transactions
 
-* `:savepoint`
-* `:auto_savepoint`
-* `:rollback`
+This database extension keeps the transaction state of Sequel and ActiveRecord
+in sync, allowing you to use Sequel and ActiveRecord transactions
+interchangeably (including nesting them), and have things like ActiveRecord's
+and Sequel's transactional callbacks still work correctly.
 
 ```rb
 ActiveRecord::Base.transaction do
-  DB.transaction(savepoint: true) do # will create a savepoint
-    DB.transaction do # will not create a savepoint
-      # ...
-    end
-  end
+  DB.in_transaction? #=> true
 end
 ```
 
-The `#in_transaction?` method is supported as well:
+Sequel's transaction API is fully supported:
 
 ```rb
-ActiveRecord::Base.transaction do
-  DB.in_transaction? #=> true
+DB.transaction(isolation: :serializable) do
+  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
 ```
 
-Other transaction-related Sequel methods (`#after_commit`, `#after_rollback`
-etc) are not supported, because ActiveRecord currently doesn't provide
-transactional callbacks on the connection level (only on the model level).
-
-### Exceptions
-
-To ensure Sequel compatibility, any `ActiveRecord::StatementInvalid` exceptions
-will be translated into Sequel exceptions:
+One caveat to keep in mind is that using Sequel's transaction/savepoint hooks
+currently don't work if ActiveRecord holds the corresponding
+transaction/savepoint. This is because it's difficult to be notified when
+ActiveRecord commits or rolls back the transaction/savepoint.
 
 ```rb
-DB[:posts].multi_insert [{ id: 1 }, { id: 1 }]
-#~> Sequel::UniqueConstraintViolation
+DB.transaction do
+  DB.after_commit { ... } # will get executed
+end
 
-DB[:posts].insert(title: nil)
-#~> Sequel::NotNullConstraintViolation
+DB.transaction do
+  DB.transaction(savepoint: true) do
+    DB.after_commit(savepoint: true) { ... } # will get executed
+  end
+end
+
+ActiveRecord::Base.transaction do
+  DB.after_commit { ... } # not allowed (will raise Sequel::ActiveRecordConnection::Error)
+end
 
-DB[:posts].insert(author_id: 123)
-#~> Sequel::ForeignKeyConstraintViolation
+DB.transaction do
+  ActiveRecord::Base.transaction(requires_new: true) do
+    DB.after_commit(savepoint: true) { ... } # not allowed (will raise Sequel::ActiveRecordConnection::Error)
+  end
+end
 ```
 
 ### Model
@@ -156,19 +153,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:

data/lib/sequel/extensions/activerecord_connection.rb

@@ -1,16 +1,24 @@
+# frozen_string_literal: true
+
 module Sequel
   module ActiveRecordConnection
     Error = Class.new(Sequel::Error)
 
+    TRANSACTION_ISOLATION_MAP = {
+      uncommitted:  :read_uncommitted,
+      committed:    :read_committed,
+      repeatable:   :repeatable_read,
+      serializable: :serializable,
+    }
+
     def self.extended(db)
       db.activerecord_model = ActiveRecord::Base
-      db.timezone = ActiveRecord::Base.default_timezone
 
       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
 
@@ -21,71 +29,118 @@ module Sequel
       raise Error, "creating a Sequel connection is not allowed"
     end
 
-    def transaction(options = {})
-      savepoint      = options.delete(:savepoint)
-      rollback       = options.delete(:rollback)
-      auto_savepoint = options.delete(:auto_savepoint)
-      server         = options.delete(:server)
+    # Avoid calling Sequel's connection pool, instead use Active Record's.
+    def synchronize(*)
+      yield activerecord_connection.raw_connection
+    end
 
-      fail Error, "#{options} transaction options are currently not supported" unless options.empty?
+    # Log executed queries into Active Record logger as well.
+    def log_connection_yield(sql, conn, args = nil)
+      sql += "; #{args.inspect}" if args
 
-      if in_transaction?
-        requires_new = savepoint || Thread.current[:sequel_activerecord_auto_savepoint]
-      else
-        requires_new = true
+      activerecord_log(sql) { super }
+    end
+
+    # Match database timezone with Active Record.
+    def timezone
+      @timezone || ActiveRecord::Base.default_timezone
+    end
+
+    private
+
+    # 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)
+      hash = super || { savepoints: [], activerecord: true }
+
+      # 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
 
-      activerecord_model.transaction(requires_new: requires_new) do
-        begin
-          Thread.current[:sequel_activerecord_auto_savepoint] = true if auto_savepoint
-          yield
-        rescue Sequel::Rollback => exception
-          raise if rollback == :reraise
-          raise ActiveRecord::Rollback, exception.message, exception.backtrace
-        ensure
-          Thread.current[:sequel_activerecord_auto_savepoint] = nil if auto_savepoint
-        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
 
-        raise ActiveRecord::Rollback if rollback == :always
+      # 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
+
+      super
     end
 
-    def in_transaction?(*)
-      activerecord_connection.transaction_open?
+    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, joinable: joinable)
     end
 
-    %i[after_commit after_rollback rollback_on_exit rollback_checker].each do |meth|
-      define_method(meth) do |*|
-        fail Error, "Database##{meth} is currently not supported"
-      end
+    def commit_transaction(conn, opts = OPTS)
+      activerecord_connection.commit_transaction
     end
 
-    # Avoid calling Sequel's connection pool, instead use ActiveRecord.
-    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
+    def rollback_transaction(conn, opts = OPTS)
+      activerecord_connection.rollback_transaction
+    end
+
+    def add_transaction_hook(conn, type, block)
+      if _trans(conn)[:activerecord]
+        fail Error, "cannot add transaction hook when ActiveRecord holds the outer transaction"
       end
+
+      super
     end
 
-    private
+    def add_savepoint_hook(conn, type, block)
+      if _trans(conn)[:savepoints].last[:activerecord]
+        fail Error, "cannot add savepoint hook when ActiveRecord holds the current savepoint"
+      end
 
-    def activerecord_raw_connection
-      activerecord_connection.raw_connection
+      super
     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,18 +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
+      end
+
+      # 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 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
-      rescue ActiveRecord::StatementInvalid => exception
-        raise_error(exception.cause, classes: database_error_classes)
-      ensure
-        result.clear if result
       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.2.5"
+  spec.version       = "1.0.0"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 
@@ -11,10 +11,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new(">= 2.2.0")
 
-  spec.add_dependency "sequel", ">= 4.0", "< 6"
+  spec.add_dependency "sequel", "~> 5.16"
   spec.add_dependency "activerecord", ">= 4.2", "< 7"
 
   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.2.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-04 00:00:00.000000000 Z
+date: 2020-10-25 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
@@ -64,6 +58,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
@@ -99,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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.