use arel to construct AST rather than generate strings

2011-01-05 09:23:25 -08:00 · 2011-01-05 09:23:25 -08:00 · 35a225535f
commit 35a225535f
parent 8de5595e4d
1 changed files with 3 additions and 2 deletions
--- 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 @@ def finder_options
          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