diff options
author | yui-knk <spiketeika@gmail.com> | 2016-01-19 00:45:13 +0900 |
---|---|---|
committer | yui-knk <spiketeika@gmail.com> | 2016-01-19 00:45:13 +0900 |
commit | 86efab1b9cac7b824ea950f5a920e054953e6732 (patch) | |
tree | 25da06ec27296d6bc25afe86e5091eb3e11b093a /activerecord/lib/active_record | |
parent | eb2c0e23f9453b18e66e17668927705e1ed22f68 (diff) | |
download | rails-86efab1b9cac7b824ea950f5a920e054953e6732.tar.gz rails-86efab1b9cac7b824ea950f5a920e054953e6732.tar.bz2 rails-86efab1b9cac7b824ea950f5a920e054953e6732.zip |
Define `:foreign_type` as a valid option in `SingularAssociation`
`:foreign_type` is a valid option for `belongs_to` and `has_one`
so remove this to `SingularAssociation`.
Diffstat (limited to 'activerecord/lib/active_record')
3 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb index f02d146e89..346329c610 100644 --- a/activerecord/lib/active_record/associations/builder/belongs_to.rb +++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb @@ -5,7 +5,7 @@ module ActiveRecord::Associations::Builder # :nodoc: end def self.valid_options(options) - super + [:foreign_type, :polymorphic, :touch, :counter_cache, :optional] + super + [:polymorphic, :touch, :counter_cache, :optional] end def self.valid_dependent_options diff --git a/activerecord/lib/active_record/associations/builder/has_one.rb b/activerecord/lib/active_record/associations/builder/has_one.rb index 9d64ae877b..4de846d12b 100644 --- a/activerecord/lib/active_record/associations/builder/has_one.rb +++ b/activerecord/lib/active_record/associations/builder/has_one.rb @@ -5,7 +5,7 @@ module ActiveRecord::Associations::Builder # :nodoc: end def self.valid_options(options) - valid = super + [:as, :foreign_type] + valid = super + [:as] valid += [:through, :source, :source_type] if options[:through] valid end diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb index 58a9c8ff24..bb96202a22 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 # :nodoc: class SingularAssociation < Association #:nodoc: def self.valid_options(options) - super + [:dependent, :primary_key, :inverse_of, :required] + super + [:foreign_type, :dependent, :primary_key, :inverse_of, :required] end def self.define_accessors(model, reflection) |