1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index a4194defc2..f3b1c9de3f 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -83,8 +83,9 @@ module ActiveRecord
           super.merge(
             :joins    => construct_joins,
             :readonly => ambiguous_select?(@reflection.options[:select]),
-            :select   => @reflection.options[:select] ||
-              Arel.sql("#{@reflection.quoted_table_name}.*, #{@owner.connection.quote_table_name @reflection.options[:join_table]}.*")
+            :select   => @reflection.options[:select] || [
+                @reflection.klass.arel_table[Arel.star],
+                join_table[Arel.star]]
           )
         end