kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Remove conditional adding a new method

Browse source 
At the point we want to add the reflection we already know the
reflection is of the AggregateReflection type so we can call a specific
method
This commit is contained in:
Rafael Mendonça França 2013-09-11 21:24:59 -03:00
parent 985ce470f6
commit 863ea1b826
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/aggregations.rb
View file

@ -224,7 +224,7 @@ module ActiveRecord
writer_method(name, class_name, mapping, allow_nil, converter)
reflection = ActiveRecord::Reflection.create(:composed_of, part_id, nil, options, self)
Reflection.add_reflection self, part_id, reflection
Reflection.add_aggregate_reflection self, part_id, reflection
end
private

10
activerecord/lib/active_record/reflection.rb
View file

@ -24,11 +24,11 @@ module ActiveRecord
end
def self.add_reflection(ar, name, reflection)
if reflection.class == AggregateReflection
ar.aggregate_reflections = ar.aggregate_reflections.merge(name => reflection)
else
ar.reflections = ar.reflections.merge(name => reflection)
end
ar.reflections = ar.reflections.merge(name => reflection)
end
def self.add_aggregate_reflection(ar, name, reflection)
ar.aggregate_reflections = ar.aggregate_reflections.merge(name => reflection)
end
# \Reflection enables to interrogate Active Record classes and objects