aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kallen <nkallen@nick-kallens-computer-2.local>2008-01-13 00:37:05 -0800
committerNick Kallen <nkallen@nick-kallens-computer-2.local>2008-01-13 00:37:05 -0800
commit59cc0e235285feeeb652ebc17a128c769e2c9d8c (patch)
tree9467cbb431d0185bfbe9b7a40dc7c096cac77891
parenteecab85b331c6bb716978262b418ab02ff4a22e9 (diff)
downloadrails-59cc0e235285feeeb652ebc17a128c769e2c9d8c.tar.gz
rails-59cc0e235285feeeb652ebc17a128c769e2c9d8c.tar.bz2
rails-59cc0e235285feeeb652ebc17a128c769e2c9d8c.zip
removed to_sql invocation for joins in base.rb... unnecessary, but perhaps confusing?
-rw-r--r--lib/active_relation/relations/base.rb2
1 files changed, 1 insertions, 1 deletions
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?),