From 59cc0e235285feeeb652ebc17a128c769e2c9d8c Mon Sep 17 00:00:00 2001 From: Nick Kallen Date: Sun, 13 Jan 2008 00:37:05 -0800 Subject: removed to_sql invocation for joins in base.rb... unnecessary, but perhaps confusing? --- lib/active_relation/relations/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_relation/relations/base.rb b/lib/active_relation/relations/base.rb index ea3404e7af..2c79911900 100644 --- a/lib/active_relation/relations/base.rb +++ b/lib/active_relation/relations/base.rb @@ -82,7 +82,7 @@ module ActiveRelation sql = [ "SELECT #{attributes.collect{ |a| a.to_sql(:use_alias => true, :use_parens => true) }.join(', ')}", "FROM #{quote_table_name(table)}", - (joins.to_sql(:quote => false) unless joins.blank?), + (joins unless joins.blank?), ("WHERE #{selects.collect{|s| s.to_sql(:quote => false)}.join("\n\tAND ")}" unless selects.blank?), ("ORDER BY #{orders.collect(&:to_sql)}" unless orders.blank?), ("LIMIT #{limit.to_sql}" unless limit.blank?), -- cgit v1.2.3