sequel-activerecord_connection 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c039d5e631eab07727b3ae6f451bc04656a5f5215a1c3389c64dead44a16f2e
-  data.tar.gz: 99402da40ca6bbbadc05dd1dfd24757368a6153a85922b705cd491c14ab54096
+  metadata.gz: 2f7d0993543eb478053e24dbbde84de0aaefdb13eb03a8852dd7d8f7facd2532
+  data.tar.gz: 104318c5d02c0731e945dd3022b109902cdf2f97176b71511d06e68b4bbf8a10
 SHA512:
-  metadata.gz: 6312fad7666b13a9fb6d670ef5b1806edb4cda9843b008090f69a8f5472982673f1180a16b5e903f0e26eab7ef6cdba3d9d6a762024ef28842d17f61f9d5ac68
-  data.tar.gz: e80315a652b89d0cb13075dc72ade8d882f3a35038f998293bfbb8f3aeed8483457e80ed085fa850694e5694fbc10a7e6641ad35bd66f3df01bdb9b3e9dc21d8
+  metadata.gz: d70812ee57dc9225683adfe196a2bc0f72de24e38cbd2d9492317073ed50a97ed58294a718d799655d953f9b80fc37dd27af78566d9f2bfaf9b95c454faa7a6d
+  data.tar.gz: b7ec97e1c602bd544df1fba4c0a554846100ac1daed3e866d8ba837ca20b68f9b44f0f89db3a97d6c5e166a80e8276d1c30159453626af5692c8f78401cd2e54

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+## 0.2.5 (2020-06-04)
+
+* Use `#current_timestamp_utc` for the JDBC SQLite adapter as well (@HoneyryderChuck)
+
+## 0.2.4 (2020-06-03)
+
+* Add JRuby support for ActiveRecord 6.0 and 5.2 (@HoneyryderChuck)
+
+* Use `#current_timestamp_utc` setting for SQLite adapter on Sequel >= 5.33 (@HoneyryderChuck)
+
+## 0.2.3 (2020-05-25)
+
+* Fix Ruby 2.7 kwargs warnings in `#transaction` (@HoneyryderChuck)
+
+## 0.2.2 (2020-05-02)
+
+* Add support for ActiveRecord 4.2 (@janko)
+
+## 0.2.1 (2020-05-02)
+
+* Add support for Active Record 5.0, 5.1 and 5.2 (@janko)
+
+* Allow Sequel 4.x (@janko)
+
+## 0.2.0 (2020-04-29)
+
+* Rename to `sequel-activerecord_connection` and make it a Sequel extension (@janko)

data/README.md

@@ -1,8 +1,9 @@
 # Sequel::ActiveRecordConnection
 
 This is an extension for [Sequel] that allows it to reuse an existing
-ActiveRecord connection for database interaction. It supports `postgresql`,
-`mysql2` and `sqlite3` adapters.
+ActiveRecord connection for database interaction. It works on ActiveRecord 4.2
+or higher, and supports the built-in `postgresql`, `mysql2` and `sqlite3`
+adapters.
 
 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
@@ -158,7 +159,7 @@ DB.activerecord_model = MyModel
 ### Timezone
 
 Sequel's database timezone will be automatically set to ActiveRecord's default
-timezone when the extension(`:utc` by default) when the extension is loaded.
+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,

data/lib/sequel/extensions/activerecord_connection.rb

@@ -21,7 +21,12 @@ module Sequel
       raise Error, "creating a Sequel connection is not allowed"
     end
 
-    def transaction(savepoint: nil, rollback: nil, auto_savepoint: nil, server: nil, **options)
+    def transaction(options = {})
+      savepoint      = options.delete(:savepoint)
+      rollback       = options.delete(:rollback)
+      auto_savepoint = options.delete(:auto_savepoint)
+      server         = options.delete(:server)
+
       fail Error, "#{options} transaction options are currently not supported" unless options.empty?
 
       if in_transaction?
@@ -57,7 +62,11 @@ module Sequel
 
     # Avoid calling Sequel's connection pool, instead use ActiveRecord.
     def synchronize(*)
-      activerecord_connection.lock.synchronize do
+      if ActiveRecord.version >= Gem::Version.new("5.1.0")
+        activerecord_connection.lock.synchronize do
+          yield activerecord_raw_connection
+        end
+      else
         yield activerecord_raw_connection
       end
     end
@@ -71,6 +80,14 @@ module Sequel
     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
+        yield
+      end
+    end
   end
 
   Database.register_extension(:activerecord_connection, ActiveRecordConnection)

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

@@ -0,0 +1,38 @@
+module Sequel
+  module ActiveRecordConnection
+    module Jdbc
+      def self.extended(db)
+        if db.timezone == :utc && db.respond_to?(:current_timestamp_utc)
+          db.current_timestamp_utc = true
+        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
+        end
+      rescue ActiveRecord::StatementInvalid => exception
+        raise_error(exception.cause, classes: database_error_classes)
+      end
+    end
+  end
+end

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

@@ -1,6 +1,12 @@
 module Sequel
   module ActiveRecordConnection
     module Sqlite
+      def self.extended(db)
+        if db.timezone == :utc && db.respond_to?(:current_timestamp_utc)
+          db.current_timestamp_utc = true
+        end
+      end
+
       def execute_ddl(sql, opts=OPTS)
         execute(sql, opts)
       end
@@ -10,12 +16,16 @@ module Sequel
       # 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)
-        activerecord_raw_connection.extended_result_codes = true
+        if activerecord_raw_connection.respond_to?(:extended_result_codes=)
+          activerecord_raw_connection.extended_result_codes = true
+        end
 
-        activerecord_connection.materialize_transactions
+        if ActiveRecord::VERSION::MAJOR >= 6
+          activerecord_connection.materialize_transactions
+        end
 
         activerecord_connection.send(:log, sql) do
-          ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+          activesupport_interlock do
             case type
             when :select
               activerecord_raw_connection.query(sql, &block)

data/sequel-activerecord_connection.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "sequel-activerecord_connection"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.5"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 
@@ -11,12 +11,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new(">= 2.2.0")
 
-  spec.add_dependency "sequel", "~> 5.0"
-  spec.add_dependency "activerecord", ">= 5.0", "< 7"
+  spec.add_dependency "sequel", ">= 4.0", "< 6"
+  spec.add_dependency "activerecord", ">= 4.2", "< 7"
 
-  spec.add_development_dependency "pg",      "~> 1.0"
-  spec.add_development_dependency "mysql2",  "~> 0.5"
-  spec.add_development_dependency "sqlite3", "~> 1.4"
   spec.add_development_dependency "minitest"
 
   spec.files         = Dir["README.md", "LICENSE.txt", "CHANGELOG.md", "lib/**/*.rb", "*.gemspec"]

metadata

@@ -1,36 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-06-04 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: '5.0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -40,52 +46,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -107,9 +71,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - 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/postgres.rb
 - lib/sequel/extensions/activerecord_connection/sqlite.rb