aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorMehmet Emin İNAÇ <mehmetemininac@gmail.com>2016-02-19 04:42:59 +0200
committerMehmet Emin İNAÇ <mehmetemininac@gmail.com>2016-10-27 11:47:14 +0300
commit94821b4bd10464d52b471380c49f85fac43a8ab7 (patch)
tree9b856be2bcb83936145bc8ef6a5a9f1af32c063a /activerecord/lib/active_record
parent7506f3390683fd1329e60385515c3c55b39ff1d5 (diff)
downloadrails-94821b4bd10464d52b471380c49f85fac43a8ab7.tar.gz
rails-94821b4bd10464d52b471380c49f85fac43a8ab7.tar.bz2
rails-94821b4bd10464d52b471380c49f85fac43a8ab7.zip
Fix HABTM associations join table resolver bug on constants and symbols
Using Constant and symbol class_name option for associations are valid but raises exception on HABTM associations. There was a test case which tries to cover symbol class_name usage but doesn't cover correctly. Fixed both symbol usage and constant usage as well. These are all working as expected now; ``` has_and_belongs_to_many :foos, class_name: 'Foo' has_and_belongs_to_many :foos, class_name: :Foo has_and_belongs_to_many :foos, class_name: Foo ``` Closes #23767
Diffstat (limited to 'activerecord/lib/active_record')
-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 047292b2bd..42a90b449c 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
@@ -28,7 +28,7 @@ module ActiveRecord::Associations::Builder # :nodoc:
class_name = options.fetch(:class_name) {
name.to_s.camelize.singularize
}
- KnownClass.new lhs_class, class_name
+ KnownClass.new lhs_class, class_name.to_s
end
end
end