diff options
author | wangjohn <wangjohn@mit.edu> | 2013-06-07 20:59:27 -0700 |
---|---|---|
committer | wangjohn <wangjohn@mit.edu> | 2013-06-08 10:16:51 -0700 |
commit | d6b03a376787ec9c9e934e5688a38c576f2e39b7 (patch) | |
tree | 33de7e28e491764e0ef27ac81ebb0322540cc12c /activerecord/lib/active_record/associations/builder | |
parent | b7f9de27f0558d6144f982cae83f32ca85a07f7e (diff) | |
download | rails-d6b03a376787ec9c9e934e5688a38c576f2e39b7.tar.gz rails-d6b03a376787ec9c9e934e5688a38c576f2e39b7.tar.bz2 rails-d6b03a376787ec9c9e934e5688a38c576f2e39b7.zip |
Getting rid of the +automatic_inverse_of: false+ option in associations in favor
of using +inverse_of: false+ option. Changing the documentation and
adding a CHANGELOG entry for the automatic inverse detection feature.
Diffstat (limited to 'activerecord/lib/active_record/associations/builder')
-rw-r--r-- | activerecord/lib/active_record/associations/builder/has_many.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/associations/builder/singular_association.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/builder/has_many.rb b/activerecord/lib/active_record/associations/builder/has_many.rb index 429def5455..0d1bdd21ee 100644 --- a/activerecord/lib/active_record/associations/builder/has_many.rb +++ b/activerecord/lib/active_record/associations/builder/has_many.rb @@ -5,7 +5,7 @@ module ActiveRecord::Associations::Builder end def valid_options - super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of, :automatic_inverse_of, :counter_cache] + super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of, :counter_cache] end def valid_dependent_options diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb index 96ccbeb8a3..76e48e66e5 100644 --- a/activerecord/lib/active_record/associations/builder/singular_association.rb +++ b/activerecord/lib/active_record/associations/builder/singular_association.rb @@ -3,7 +3,7 @@ module ActiveRecord::Associations::Builder class SingularAssociation < Association #:nodoc: def valid_options - super + [:remote, :dependent, :counter_cache, :primary_key, :inverse_of, :automatic_inverse_of] + super + [:remote, :dependent, :counter_cache, :primary_key, :inverse_of] end def constructable? |