aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/builder
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/associations/builder')
-rw-r--r--activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb4
1 files changed, 3 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 ad781e50c9..a297439214 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
@@ -24,9 +24,11 @@ module ActiveRecord::Associations::Builder
else
class_name = options.fetch(:class_name) {
model_name = name.to_s.camelize.singularize
- if parent_name = lhs_class.parent_name.presence
+
+ if parent_name = lhs_class.parent_name
model_name = model_name.prepend("#{parent_name}::")
end
+
model_name
}
KnownClass.new lhs_class, class_name