aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorshiksha <shiksha@vinsol.com>2014-11-13 11:13:44 +0530
committershiksha <shiksha@vinsol.com>2014-11-13 11:13:44 +0530
commit07e0d8cc0c108b2814d5c8d29f5f3f5b1db4f696 (patch)
tree20d0d5069c800aed1b8ff5011a005d13d16f4a1e /activerecord/lib
parent52c3a16fa07cde643af3c2200e4b87bcb470eb12 (diff)
downloadrails-07e0d8cc0c108b2814d5c8d29f5f3f5b1db4f696.tar.gz
rails-07e0d8cc0c108b2814d5c8d29f5f3f5b1db4f696.tar.bz2
rails-07e0d8cc0c108b2814d5c8d29f5f3f5b1db4f696.zip
Allow habtm class_name option to be consistent with other associations
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
index 357b28ac94..092b4ebd2f 100644
--- a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
@@ -110,7 +110,7 @@ module ActiveRecord::Associations::Builder
rhs_options = {}
if options.key? :class_name
- rhs_options[:foreign_key] = options[:class_name].foreign_key
+ rhs_options[:foreign_key] = options[:class_name].to_s.foreign_key
rhs_options[:class_name] = options[:class_name]
end