sequel-activerecord_connection 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f7d0993543eb478053e24dbbde84de0aaefdb13eb03a8852dd7d8f7facd2532
-  data.tar.gz: 104318c5d02c0731e945dd3022b109902cdf2f97176b71511d06e68b4bbf8a10
+  metadata.gz: 95766ef8e2bf54388e4a139f430c42176760f2b77e0322902445414ffe3d7ddb
+  data.tar.gz: 35a9fe4b35ff4037299799be9d902e93a29f9d81333ddf084374a4525761a2b1
 SHA512:
-  metadata.gz: d70812ee57dc9225683adfe196a2bc0f72de24e38cbd2d9492317073ed50a97ed58294a718d799655d953f9b80fc37dd27af78566d9f2bfaf9b95c454faa7a6d
-  data.tar.gz: b7ec97e1c602bd544df1fba4c0a554846100ac1daed3e866d8ba837ca20b68f9b44f0f89db3a97d6c5e166a80e8276d1c30159453626af5692c8f78401cd2e54
+  metadata.gz: 93a612e4cfc3454783ba936a19518459fee958e53f8193e9f0561d65961008892a7b8c24a3189e5b2cc8620803e0da1375cd36f5c319af4adf7461656e2e462e
+  data.tar.gz: 526c8b8ce56b481f5fa98ff1dbd242fc9104665dab6166bd4797514ae187bfe0e9460881dc9f6783e1216323a9a0d701949de2d1972865d464a9a13c51dd4c41

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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/lib/sequel/extensions/activerecord_connection.rb

@@ -22,31 +22,22 @@ module Sequel
     end
 
     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?
-        requires_new = savepoint || Thread.current[:sequel_activerecord_auto_savepoint]
-      else
-        requires_new = true
+      %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
 

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/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       = "0.2.6"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-04 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel