aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/persistence.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-03-04 03:30:13 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-03-04 03:30:13 +0900
commit6932998fc7aecba6ade04f8d799f07b494dd402c (patch)
treea52a66b8c8e21caf4139e0806b6ee17ff28de31f /activerecord/lib/active_record/persistence.rb
parent7d5a7b30cc79d91f3e3fa8ee81a077276947eb72 (diff)
downloadrails-6932998fc7aecba6ade04f8d799f07b494dd402c.tar.gz
rails-6932998fc7aecba6ade04f8d799f07b494dd402c.tar.bz2
rails-6932998fc7aecba6ade04f8d799f07b494dd402c.zip
`id_in_database` do not return nil value for persisted record
This removes `|| id` which were added in #9963 and #23887 since it is no longer necessary.
Diffstat (limited to 'activerecord/lib/active_record/persistence.rb')
-rw-r--r--activerecord/lib/active_record/persistence.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index 4eecbd0629..c9f929680b 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -188,8 +188,8 @@ module ActiveRecord
connection.insert(im, "#{self} Create", primary_key || false, primary_key_value)
end
- def _update_record(values, id, id_was) # :nodoc:
- bind = predicate_builder.build_bind_attribute(primary_key, id_was || id)
+ def _update_record(values, id) # :nodoc:
+ bind = predicate_builder.build_bind_attribute(primary_key, id)
um = arel_table.where(
arel_attribute(primary_key).eq(bind)
).compile_update(_substitute_values(values), primary_key)
@@ -710,7 +710,7 @@ module ActiveRecord
rows_affected = 0
@_trigger_update_callback = true
else
- rows_affected = self.class._update_record(attributes_values, id, id_in_database)
+ rows_affected = self.class._update_record(attributes_values, id_in_database)
@_trigger_update_callback = rows_affected > 0
end