diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-03-03 18:44:09 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-03-05 09:52:58 +0900 |
commit | ae2d36cf21281f4b720332a086b021d867e80084 (patch) | |
tree | 9d5dd0ad9122535f9607273a948ea5e91e5c8bb2 /activerecord/lib/active_record/persistence.rb | |
parent | ea45d56d3d23e703b2866524202649e333fd7408 (diff) | |
download | rails-ae2d36cf21281f4b720332a086b021d867e80084.tar.gz rails-ae2d36cf21281f4b720332a086b021d867e80084.tar.bz2 rails-ae2d36cf21281f4b720332a086b021d867e80084.zip |
Introduce `_update_row` to decouple optimistic locking concern from `Persistence` module
Diffstat (limited to 'activerecord/lib/active_record/persistence.rb')
-rw-r--r-- | activerecord/lib/active_record/persistence.rb | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index 7b0b7a18e3..ce16587326 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -663,31 +663,12 @@ module ActiveRecord unless attribute_names.empty? attribute_names.each do |attr_name| write_attribute(attr_name, time) + clear_attribute_change(attr_name) end - constraints = { self.class.primary_key => id_in_database } + affected_rows = _update_row(attribute_names, "touch") - if locking_enabled? - locking_column = self.class.locking_column - constraints[locking_column] = read_attribute_before_type_cast(locking_column) - attribute_names << locking_column - increment_lock - end - - clear_attribute_changes(attribute_names) - - affected_rows = self.class._update_record( - attributes_with_values_for_update(attribute_names), - constraints - ) - - result = affected_rows == 1 - - if !result && locking_enabled? - raise ActiveRecord::StaleObjectError.new(self, "touch") - end - - @_trigger_update_callback = result + @_trigger_update_callback = affected_rows == 1 else true end @@ -707,6 +688,13 @@ module ActiveRecord self.class._delete_record(self.class.primary_key => id_in_database) end + def _update_row(attribute_names, attempted_action) + self.class._update_record( + attributes_with_values(attribute_names), + self.class.primary_key => id_in_database + ) + end + def create_or_update(*args, &block) _raise_readonly_record_error if readonly? return false if destroyed? @@ -718,15 +706,13 @@ module ActiveRecord # Returns the number of affected rows. def _update_record(attribute_names = self.attribute_names) attribute_names &= self.class.column_names - attributes_values = attributes_with_values_for_update(attribute_names) - if attributes_values.empty? + attribute_names = attributes_for_update(attribute_names) + + if attribute_names.empty? affected_rows = 0 @_trigger_update_callback = true else - affected_rows = self.class._update_record( - attributes_values, - self.class.primary_key => id_in_database - ) + affected_rows = _update_row(attribute_names, "update") @_trigger_update_callback = affected_rows == 1 end |