From a11e2fcff8cdc9691b977d8330abe63024f8c732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 14 May 2014 21:46:40 -0300 Subject: Don't use Active Support where it is not needed. parent_name is a string of nil, never a blank string so we don't need to use presence. --- .../lib/active_record/associations/builder/has_and_belongs_to_many.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'activerecord/lib') 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 -- cgit v1.2.3