diff options
| author | eileencodes <eileencodes@gmail.com> | 2014-07-21 17:50:31 -0400 |
|---|---|---|
| committer | eileencodes <eileencodes@gmail.com> | 2014-07-30 20:16:27 -0400 |
| commit | 8d7dea766e7a5371dab09bf4c819ff1fc28ffa31 (patch) | |
| tree | 6f24208eddb58a78b13a14f2dd9508ab2f5c73a2 /activerecord/lib/active_record/associations/has_many_association.rb | |
| parent | 20a277c9a2a2f1bb0ff2a77d52f7e9590dbae8ac (diff) | |
| download | rails-8d7dea766e7a5371dab09bf4c819ff1fc28ffa31.tar.gz rails-8d7dea766e7a5371dab09bf4c819ff1fc28ffa31.tar.bz2 rails-8d7dea766e7a5371dab09bf4c819ff1fc28ffa31.zip | |
Redefine macro checks for reflections
Now that we define the macro on the reflection type we no longer
need to check `macro == :what` on each type for `belongs_to?` or
`has_one?` etc. These now default to false unless it's defined
in the reflection class.
Reuse existing belongs_to? method to check macros
We don't need to do `:belongs_to == macro` anymore becasue we
have a `belongs_to?` method. I didn't find this being used
anywhere for `has_one?` or `collection?` since they were already
fixed.
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 2a97d0ed31..79c3d2b0f5 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -124,7 +124,7 @@ module ActiveRecord def inverse_updates_counter_named?(counter_name, reflection = reflection()) reflection.klass._reflections.values.any? { |inverse_reflection| - :belongs_to == inverse_reflection.macro && + inverse_reflection.belongs_to? && inverse_reflection.counter_cache_column == counter_name } end |