sequel-activerecord_connection 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c11ff9b3633981f462112bbbb844ec6033522314b6849d66b1f1868976521549
-  data.tar.gz: 6ef2ebc50251b4e0f894d95e4953afbabd9b1a955a226809053a664788c94bc9
+  metadata.gz: 95766ef8e2bf54388e4a139f430c42176760f2b77e0322902445414ffe3d7ddb
+  data.tar.gz: 35a9fe4b35ff4037299799be9d902e93a29f9d81333ddf084374a4525761a2b1
 SHA512:
-  metadata.gz: 867693e62bde77afd9ff107f73670b488dbdd3f53ab1665da27a59d560d2737c045446e1d1995c49f9f700cc215303167404349c4c275597b030c5b65637c7e8
-  data.tar.gz: 0ceb8dc99f066df61850fdd596d3dbb5543fa437ffe428a3722d2d77a89e9227edccb57023d0d83834c1b9d846f2d06ccbac20c9904d19ba79c9db8470a5cbb8
+  metadata.gz: 93a612e4cfc3454783ba936a19518459fee958e53f8193e9f0561d65961008892a7b8c24a3189e5b2cc8620803e0da1375cd36f5c319af4adf7461656e2e462e
+  data.tar.gz: 526c8b8ce56b481f5fa98ff1dbd242fc9104665dab6166bd4797514ae187bfe0e9460881dc9f6783e1216323a9a0d701949de2d1972865d464a9a13c51dd4c41

data/CHANGELOG.md

@@ -0,0 +1,33 @@
+## 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)
+
+## 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

data/lib/sequel/extensions/activerecord_connection.rb

@@ -21,27 +21,23 @@ module Sequel
       raise Error, "creating a Sequel connection is not allowed"
     end
 
-    def transaction(savepoint: nil, rollback: nil, auto_savepoint: nil, server: nil, **options)
-      fail Error, "#{options} transaction options are currently not supported" unless options.empty?
-
-      if in_transaction?
-        requires_new = savepoint || Thread.current[:sequel_activerecord_auto_savepoint]
-      else
-        requires_new = true
+    def transaction(options = {})
+      %i[isolation num_retries before_retry prepare retry_on].each do |key|
+        fail Error, "#{key.inspect} transaction option is currently not supported" if options.key?(key)
       end
 
-      activerecord_model.transaction(requires_new: requires_new) do
+      activerecord_model.transaction(requires_new: !in_transaction? || options[:savepoint] || Thread.current[:sequel_activerecord_auto_savepoint]) do
         begin
-          Thread.current[:sequel_activerecord_auto_savepoint] = true if auto_savepoint
-          yield
+          Thread.current[:sequel_activerecord_auto_savepoint] = true if options[:auto_savepoint]
+          result = yield
+          raise ActiveRecord::Rollback if options[:rollback] == :always
+          result
         rescue Sequel::Rollback => exception
-          raise if rollback == :reraise
+          raise if options[:rollback] == :reraise
           raise ActiveRecord::Rollback, exception.message, exception.backtrace
         ensure
-          Thread.current[:sequel_activerecord_auto_savepoint] = nil if auto_savepoint
+          Thread.current[:sequel_activerecord_auto_savepoint] = nil if options[:auto_savepoint]
         end
-
-        raise ActiveRecord::Rollback if rollback == :always
       end
     end
 
@@ -75,6 +71,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/postgres.rb

@@ -14,6 +14,14 @@ module Sequel
       ensure
         result.clear if result
       end
+
+      def transaction(options = {})
+        %i[deferrable read_only synchronous].each do |key|
+          fail Error, "#{key.inspect} transaction option is currently not supported" if options.key?(key)
+        end
+
+        super
+      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
@@ -19,7 +25,7 @@ module Sequel
         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.1"
+  spec.version       = "0.2.6"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 
@@ -12,11 +12,8 @@ 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 "activerecord", ">= 5.0", "< 7"
+  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.3"
   spec.add_development_dependency "minitest"
 
   spec.files         = Dir["README.md", "LICENSE.txt", "CHANGELOG.md", "lib/**/*.rb", "*.gemspec"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -46,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.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -113,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