From 0faeb5047407348533db952d9cf93ea59d2526dc Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Tue, 10 Nov 2009 15:23:54 -0500 Subject: Ruby 1.9: Array#to_s behaves like inspect now, so we don't want to use it here (needs spec!) --- lib/arel/engines/sql/relations/relation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb index 2edbe6a5f7..b8f384a4c1 100644 --- a/lib/arel/engines/sql/relations/relation.rb +++ b/lib/arel/engines/sql/relations/relation.rb @@ -12,7 +12,7 @@ module Arel order = order.zip((0...order.size).to_a).map { |s,i| "id_list.alias_#{i} #{'DESC' if s =~ /\bdesc$/i}" }.join(', ') query = build_query \ - "SELECT #{select_clauses.to_s}", + "SELECT #{select_clauses.kind_of?(::Array) ? select_clauses.join("") : select_clauses.to_s}", "FROM #{table_sql(Sql::TableReference.new(self))}", (joins(self) unless joins(self).blank? ), ("WHERE #{where_clauses.join("\n\tAND ")}" unless wheres.blank? ), -- cgit v1.2.3