diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-04-25 15:48:39 -0500 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-04-25 15:48:39 -0500 |
| commit | 856ea2a6a5cd3770948f1d0f9de188770f10653d (patch) | |
| tree | f6c275aa320a5f9ff8a69265207a186650fcb45b /activerecord/lib | |
| parent | 0dd3d2c0d490211b4d0eda87003716224465e9a5 (diff) | |
| parent | 18fa87b8663ac88fd280e9860505598fe04cd46a (diff) | |
| download | rails-856ea2a6a5cd3770948f1d0f9de188770f10653d.tar.gz rails-856ea2a6a5cd3770948f1d0f9de188770f10653d.tar.bz2 rails-856ea2a6a5cd3770948f1d0f9de188770f10653d.zip | |
Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtm
Fix to use custom join table in habtm
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/has_many.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 4abe2ad0a0..5309651725 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1590,7 +1590,7 @@ module ActiveRecord hm_options[:through] = middle_reflection.name hm_options[:source] = join_model.right_reflection.name - [:before_add, :after_add, :before_remove, :after_remove, :autosave, :validate].each do |k| + [:before_add, :after_add, :before_remove, :after_remove, :autosave, :validate, :join_table].each do |k| hm_options[k] = options[k] if options.key? k end diff --git a/activerecord/lib/active_record/associations/builder/has_many.rb b/activerecord/lib/active_record/associations/builder/has_many.rb index 7909b93622..4c8c826f76 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, :counter_cache] + super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of, :counter_cache, :join_table] end def self.valid_dependent_options |