aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorKassio Borges <kassioborgesm@gmail.com>2014-04-25 17:34:13 -0300
committerKassio Borges <kassioborgesm@gmail.com>2014-04-25 17:34:13 -0300
commit18fa87b8663ac88fd280e9860505598fe04cd46a (patch)
treeea0d8320a94ce470d1320f63f882285b4f58fc51 /activerecord/lib/active_record/associations
parent7fe5ae8d237c8f821bc5e984f98d9d7eb7c35266 (diff)
downloadrails-18fa87b8663ac88fd280e9860505598fe04cd46a.tar.gz
rails-18fa87b8663ac88fd280e9860505598fe04cd46a.tar.bz2
rails-18fa87b8663ac88fd280e9860505598fe04cd46a.zip
Fix custom join_table name on habtm reflections
When used a custom join_table name on a habtm, rails was not saving it on Reflections. This causes a problem when rails loads fixtures, because it uses the reflections to set database with fixtures.
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/builder/has_many.rb2
1 files changed, 1 insertions, 1 deletions
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