activerecord-update 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea8267a673e2b98e469272b396c95715d72293a0
-  data.tar.gz: 758e3c003b4711eb333f99dc89488a9f84dbf6e0
+  metadata.gz: c2f6991302388163951e76a30a77490613974ad6
+  data.tar.gz: 69c7913ae32b9b2be3ead5c5570fdad080cc425b
 SHA512:
-  metadata.gz: 6bd413d5d665399e192852db292c1624ea7d6b5e95ab86bc4956aeb5ad56a1aec83f3c1ecb6c4920f1628fdb07892ddbf39e68d46d571bb92552f01fc427bf2a
-  data.tar.gz: 65ffd2ccf31fab618f5cf5e316691321cbeebdaf33a785a495c1db51f3b2a75658c95a9f5d16092c3b4b141bdc4d958a036897b45461172b34cf8a48f1092184
+  metadata.gz: 05c28fe52389d585a66a5e4818c8849c5203a1a53db2399468f84c0449d3ffe1412b3e8604df679ef749eebd65d4eea05bbc14e5fba409af5ef42cbd2f049f4a
+  data.tar.gz: c1ff81888f193ac6477339581a97d93de28ed838ff09f43f312ace5718e5ef275a7eaab903b42368bf44734d4f296f2e942d333daed5d403abc54343d08d12cb

data/.rubocop.yml

@@ -14,3 +14,6 @@ Metrics/BlockLength:
   Exclude:
     - activerecord-update.gemspec
     - spec/**/*_spec.rb
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation

data/lib/activerecord-update/active_record/base.rb

@@ -98,6 +98,7 @@ module ActiveRecord
       private
 
       # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize
 
       # (see .update_records)
       #
@@ -109,9 +110,9 @@ module ActiveRecord
       #
       # @see .update_records
       def _update_records(
-          records,
-          raise_on_validation_failure:,
-          raise_on_stale_objects:
+        records,
+        raise_on_validation_failure:,
+        raise_on_stale_objects:
       )
 
         changed = changed_records(records)
@@ -119,15 +120,28 @@ module ActiveRecord
         return build_result(valid, failed, []) if valid.empty?
 
         timestamp = current_time
-        query = sql_for_update_records(valid, timestamp)
-        ids = perform_update_records_query(query, primary_key)
-        result = build_result(valid, failed, ids)
-        validate_result(result, raise_on_stale_objects)
-
-        update_timestamp(valid, timestamp)
-        mark_changes_applied(valid)
-        result
+        previous_lock_values = {}
+
+        begin
+          query = sql_for_update_records(valid, timestamp, previous_lock_values)
+          ids = perform_update_records_query(query, primary_key)
+          result = build_result(valid, failed, ids)
+          restore_lock(result.stale_objects, previous_lock_values)
+
+          successful_records = valid - result.stale_objects
+          update_timestamp(successful_records, timestamp)
+          mark_changes_applied(successful_records)
+
+          validate_result(result, raise_on_stale_objects)
+          result
+        # rubocop:disable Lint/RescueException
+        rescue Exception
+          # rubocop:enable Lint/RescueException
+          restore_lock(records, previous_lock_values)
+          raise
+        end
       end
+      # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/MethodLength
 
       # Returns the given records that are not new records and have changed.
@@ -210,12 +224,17 @@ module ActiveRecord
       # @param records [<ActiveRecord::Base>] the records that have changed
       # @param timestamp [Time] the timestamp used for the `updated_at` column
       #
+      # @param previous_lock_values [{ Integer => Integer }] on return, this
+      #   hash will contain the record ID's mapping to the previous lock
+      #   versions. In an error occurs this hash can be used to restore the lock
+      #   attribute to its previous value.
+      #
       # @return the SQL query for the #{update_records} method
       #
       # @see #update_records
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/AbcSize
-      def sql_for_update_records(records, timestamp)
+      def sql_for_update_records(records, timestamp, previous_lock_values)
         attributes = changed_attributes(records)
         quoted_changed_attributes = changed_attributes_for_sql(
           attributes, quoted_table_alias
@@ -223,7 +242,12 @@ module ActiveRecord
 
         attributes = all_attributes(attributes)
         casts = type_casts(attributes)
-        values = changed_values(records, attributes, timestamp)
+        values = changed_values(
+          records,
+          attributes,
+          timestamp,
+          previous_lock_values
+        )
         quoted_values = values_for_sql(values)
         quoted_column_names = column_names_for_sql(attributes)
         template = build_sql_template
@@ -353,6 +377,7 @@ module ActiveRecord
       end
 
       # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize
 
       # Returns the values of the given records that have changed.
       #
@@ -390,11 +415,18 @@ module ActiveRecord
       #
       # @param updated_at [Time] the value of the updated_at column
       #
+      # @param previous_lock_values [{ Integer => Integer }] on return, this
+      #   hash will contain the record ID's mapping to the previous lock
+      #   versions. In an error occurs this hash can be used to restore the lock
+      #   attribute to its previous value.
+      #
       # @return [<<Object>>] the changed values
       #
       # @raise [ArgumentError]
       #   * if the given list of records or changed attributes is `nil` or empty
-      def changed_values(records, changed_attributes, updated_at)
+      def changed_values(records, changed_attributes, updated_at,
+        previous_lock_values)
+
         raise ArgumentError, 'No changed records given' if records.blank?
 
         if changed_attributes.blank?
@@ -404,6 +436,10 @@ module ActiveRecord
         extract_changed_values = lambda do |record|
           previous_lock_value = increment_lock(record)
 
+          if locking_enabled?
+            previous_lock_values[record.id] = previous_lock_value
+          end
+
           # We're using `slice` instead of `changed_attributes` because we need
           # to include all the changed attributes from all the changed records
           # and not just the changed attributes for a given record.
@@ -417,11 +453,17 @@ module ActiveRecord
 
         records.map(&extract_changed_values)
       end
+      # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/MethodLength
 
       # Increments the lock column of the given record if locking is enabled.
       #
-      # @param [ActiveRecord::Base] the record to update the lock column for
+      # @param record [ActiveRecord::Base] the record to update the lock column
+      #   for
+      #
+      # @param operation [:decrement, :increment] the operation to perform,
+      #   increment or decrement
+      #
       # @return [void]
       def increment_lock(record)
         return unless locking_enabled?
@@ -432,6 +474,27 @@ module ActiveRecord
         previous_lock_value
       end
 
+      # Restores the lock column of the given records to given values,
+      #   if locking is enabled.
+      #
+      # @param records [<ActiveRecord::Base>] the records to restore the lock
+      #   column on
+      #
+      # @param lock_values [{ Integer => Integer }] this hash contains the
+      #   record ID's mapping to the lock values that should be restored.
+      #
+      # @return [void]
+      def restore_lock(records, lock_values)
+        return if !locking_enabled? || records.empty?
+        method_name = locking_column + '='
+
+        records.each do |record|
+          lock_value = lock_values[record.id]
+          next unless lock_value
+          record.send(method_name, lock_value)
+        end
+      end
+
       # Returns the values of the given records that have changed, formatted for
       # SQL.
       #

data/lib/activerecord-update/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Update
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.0.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-update
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jacob Carlborg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord