mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
fixed a 'RecordNotFound' bug when calling 'reload' on a object which doesn't met the default_scope conditions, added test [#3166 status:resolved]
The reload method didn't made use of 'with_exclusive_scope' when reloading the object. This lead to a RecordNotFound exception, in case the object doesn't met the default_scope condition (anymore) - which is obviously a bug. This quick fix makes use of with_exclusive_scope in the reload method as well. See test for full example. Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
committed by
José Valim
parent
5695b1bdd9
commit
b06e5dce97
@@ -2716,7 +2716,7 @@ module ActiveRecord #:nodoc:
|
||||
def reload(options = nil)
|
||||
clear_aggregation_cache
|
||||
clear_association_cache
|
||||
@attributes.update(self.class.find(self.id, options).instance_variable_get('@attributes'))
|
||||
@attributes.update(self.class.send(:with_exclusive_scope) { self.class.find(self.id, options) }.instance_variable_get('@attributes'))
|
||||
@attributes_cache = {}
|
||||
self
|
||||
end
|
||||
|
||||
@@ -1645,6 +1645,12 @@ class BasicsTest < ActiveRecord::TestCase
|
||||
assert_equal t1.title, t2.title
|
||||
end
|
||||
|
||||
def test_reload_with_exclusive_scope
|
||||
dev = DeveloperCalledDavid.first
|
||||
dev.update_attributes!( :name => "NotDavid" )
|
||||
assert_equal dev, dev.reload
|
||||
end
|
||||
|
||||
def test_define_attr_method_with_value
|
||||
k = Class.new( ActiveRecord::Base )
|
||||
k.send(:define_attr_method, :table_name, "foo")
|
||||
|
||||
Reference in New Issue
Block a user