Merge pull request #6056 from jeremyf/remove-deprecation-warning-due-to-reload

Removed deprecation warning for #find as a result of AR::Base#reload

1 files changed, 7 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index 12e232a97f..d6ffa1a9f7 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -268,7 +268,13 @@ module ActiveRecord
       clear_aggregation_cache
       clear_association_cache
 
-      fresh_object = self.class.unscoped { self.class.find(id, options) }
+      fresh_object =
+        if options.present? && options[:lock]
+          self.class.unscoped { self.class.lock.find(id) }
+        else
+          self.class.unscoped { self.class.find(id) }
+        end
+
       @attributes.update(fresh_object.instance_variable_get('@attributes'))
       @columns_hash = fresh_object.instance_variable_get('@columns_hash')