activerecord-updateinbulk 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a844813b98d092d304542eb4f8c3ffc6b99a50f7510d430bef229e47c969415
-  data.tar.gz: e83aa71485ad9255b977b96afe9a8ec55820eda485d489d16e30629c1a79a971
+  metadata.gz: 5b333b357426d210ed69dfa18de2f7f77ae8088e9fc47819198118f22f7647fc
+  data.tar.gz: 96eb8a466eb413735de1e1ed4e80dbbc18402b356b5870d9b24b92826828b425
 SHA512:
-  metadata.gz: 45d04870ea3981cc5bb3533572f8fd412cc442bfbde77163d2d78bb47af3e3234658db990afdea09fc754f6d492ed400bc50f7f23508f01a82614f1803fae05e
-  data.tar.gz: 33dfb33a7963b357eb8da64afc3353e671fa33cab926e8bf3b9380ccecd47dbae1360f776159e35dc02a44c0c8f98721d7ed58306eebc456bf89673b0fc14900
+  metadata.gz: 7a9ff7817a67baf305cd391c855e7607b7adc4c756abadf8d11bba119ad137bd378e83841e80dacaa0abe8265cd3c6d432f58faa4029608fe783c3ab410b7b14
+  data.tar.gz: b71a70301fa255f1c52ae9472b6cce357b2d8f10313226398e74294af0a76179b04383d3d2c5fa52b82fa05dc5dd3581fe4da0330414c1394d8ab900dd4863e9

data/README.md

@@ -61,17 +61,10 @@ Order.joins(:items).where(items: { status: :shipped }).update_in_bulk({
 
 ### Rails configuration
 
-Railtie options are available at `config.active_record_update_in_bulk`:
+Railtie initializer options are available at `config.active_record_update_in_bulk`:
 
 - `values_table_alias` (`String`, optional): alias used for generated VALUES tables (default `"t"`).
-- `ignore_scope_order` (`Boolean`, default `true`): when true, ORDER BY scopes are ignored by `update_in_bulk`; when false, ordered relations raise `NotImplementedError`.
-
-Example initializer:
-
-```ruby
-Rails.application.config.active_record_update_in_bulk.values_table_alias = "vals"
-Rails.application.config.active_record_update_in_bulk.ignore_scope_order = true
-```
+- `ignore_scope_order` (`Boolean`, default `true`): when true, ORDER BY scopes are ignored by `update_in_bulk`.
 
 ### Record timestamps
 

data/lib/activerecord-updateinbulk/builder.rb

@@ -138,9 +138,11 @@ module ActiveRecord::UpdateInBulk
       @conditions = conditions
       @assigns = assigns
       @formulas = normalize_formulas(formulas)
+      @auto_locking_column = nil
 
       resolve_attribute_aliases!
       resolve_read_and_write_keys!
+      apply_optimistic_locking!
       verify_read_and_write_keys!
       serialize_values!
       detect_constant_columns! unless simple_update?
@@ -222,7 +224,7 @@ module ActiveRecord::UpdateInBulk
 
       def build_values_table_rows
         bitmask_keys = Set.new
-        non_constant_write_keys = write_keys - constant_assigns.keys
+        non_constant_write_keys = write_keys.reject { |key| constant_assigns.key?(key) }
 
         rows = @conditions.map.with_index do |row_conditions, row_index|
           row_assigns = @assigns[row_index]
@@ -264,6 +266,10 @@ module ActiveRecord::UpdateInBulk
         else
           build_simple_assignments(table)
         end
+        if @auto_locking_column
+          lock = table[@auto_locking_column]
+          set_assignments << [lock, table.coalesce(lock, 0) + 1]
+        end
 
         if timestamp_keys.any?
           # Timestamp assignments precede data assignments to increase the
@@ -288,7 +294,8 @@ module ActiveRecord::UpdateInBulk
           if constant_assigns.key?(key)
             rhs = Arel::Nodes::Quoted.new(constant_assigns[key])
           else
-            rhs = values_table[column]
+            val = values_table[column]
+            rhs = val
             column += 1
             rhs = self.class.apply_formula(formula, lhs, rhs, model) if formula
           end
@@ -296,7 +303,11 @@ module ActiveRecord::UpdateInBulk
           if function = bitmask_functions[key]
             rhs = Arel::Nodes::Case.new(function).when("1").then(rhs).else(lhs)
           elsif optional_keys.include?(key)
-            rhs = table.coalesce(rhs, lhs)
+            if formula
+              rhs = Arel::Nodes::Case.new.when(val.eq(nil)).then(lhs).else(rhs)
+            else
+              rhs = table.coalesce(rhs, lhs)
+            end
           end
           [lhs, rhs]
         end
@@ -359,6 +370,15 @@ module ActiveRecord::UpdateInBulk
         normalized
       end
 
+      def apply_optimistic_locking!
+        return unless model.locking_enabled?
+
+        locking_column = model.locking_column
+        return if write_keys.include?(locking_column)
+
+        @auto_locking_column = locking_column
+      end
+
       def resolve_attribute_aliases!
         return if model.attribute_aliases.empty?
 

data/lib/activerecord-updateinbulk/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module UpdateInBulk
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-updateinbulk
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Bruno Carvalho