diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-19 18:33:31 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-19 18:33:31 -0200 |
| commit | 7a5a3a8828827dab7532a04a2c02a9c6aa626cd1 (patch) | |
| tree | 114d5e2f0020da040abdc8a1f68bb244cdb4772b /activerecord/lib/active_record | |
| parent | 70c2bf9d21386731135b69125ef00c8810a22a1c (diff) | |
| parent | 07e0d8cc0c108b2814d5c8d29f5f3f5b1db4f696 (diff) | |
| download | rails-7a5a3a8828827dab7532a04a2c02a9c6aa626cd1.tar.gz rails-7a5a3a8828827dab7532a04a2c02a9c6aa626cd1.tar.bz2 rails-7a5a3a8828827dab7532a04a2c02a9c6aa626cd1.zip | |
Merge pull request #17575 from shikshachauhan/make-habtm-consistent
Allow class_name option in habtm to be consistent with other association...
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb | 2 |
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 |