diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-09 20:21:58 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-09 20:21:58 -0300 |
| commit | e1175d99e2c2813b248475fd0234818cd3b3e386 (patch) | |
| tree | d98e6c750d2aa01d524782cdc763d105a3a487cb /activerecord/lib/active_record/associations | |
| parent | 32b6873d0899ab185bc862db09c18fcaed88bdb3 (diff) | |
| parent | 5a0b184c53bf649930b153f3c39c542eca25d74a (diff) | |
| download | rails-e1175d99e2c2813b248475fd0234818cd3b3e386.tar.gz rails-e1175d99e2c2813b248475fd0234818cd3b3e386.tar.bz2 rails-e1175d99e2c2813b248475fd0234818cd3b3e386.zip | |
Merge pull request #15596 from eileencodes/add-has_one-method-and-reuse
add has_one? method and reuse instead of checking macro
Diffstat (limited to 'activerecord/lib/active_record/associations')
3 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb index 4a04303fb8..89cbb50035 100644 --- a/activerecord/lib/active_record/associations/association.rb +++ b/activerecord/lib/active_record/associations/association.rb @@ -179,7 +179,7 @@ module ActiveRecord def creation_attributes attributes = {} - if (reflection.macro == :has_one || reflection.macro == :has_many) && !options[:through] + if (reflection.has_one? || reflection.macro == :has_many) && !options[:through] attributes[reflection.foreign_key] = owner[reflection.active_record_primary_key] if reflection.options[:as] diff --git a/activerecord/lib/active_record/associations/belongs_to_association.rb b/activerecord/lib/active_record/associations/belongs_to_association.rb index 1edd4fa3aa..81fdd681de 100644 --- a/activerecord/lib/active_record/associations/belongs_to_association.rb +++ b/activerecord/lib/active_record/associations/belongs_to_association.rb @@ -92,7 +92,7 @@ module ActiveRecord # has_one associations. def invertible_for?(record) inverse = inverse_reflection_for(record) - inverse && inverse.macro == :has_one + inverse && inverse.has_one? end def target_id diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index f6e08991f7..f155ab1d2a 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -107,7 +107,7 @@ module ActiveRecord if inverse if inverse.macro == :has_many record.send(inverse.name) << build_through_record(record) - elsif inverse.macro == :has_one + elsif inverse.has_one? record.send("#{inverse.name}=", build_through_record(record)) end end |