diff options
| author | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-05-04 17:23:22 -0700 |
|---|---|---|
| committer | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-05-04 17:23:22 -0700 |
| commit | 5e52a24e67dfedaf9b2a3bb6601f79f1f8e00c72 (patch) | |
| tree | ff4c102dab9d6e27819b9dd6b9f6e22b6df2580b /lib/arel | |
| parent | 9d8e661a1ad5e2f1904cef1d076355273aa6146e (diff) | |
| download | rails-5e52a24e67dfedaf9b2a3bb6601f79f1f8e00c72.tar.gz rails-5e52a24e67dfedaf9b2a3bb6601f79f1f8e00c72.tar.bz2 rails-5e52a24e67dfedaf9b2a3bb6601f79f1f8e00c72.zip | |
additional testing
Diffstat (limited to 'lib/arel')
| -rw-r--r-- | lib/arel/relations/relation.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/arel/relations/relation.rb b/lib/arel/relations/relation.rb index 62656773dd..846594e7cd 100644 --- a/lib/arel/relations/relation.rb +++ b/lib/arel/relations/relation.rb @@ -115,8 +115,8 @@ module Arel "SELECT #{attributes.collect { |a| a.to_sql(Sql::SelectClause.new(self)) }.join(', ')}", "FROM #{table_sql(Sql::TableReference.new(self))}", (joins(Sql::TableReference.new(self)) unless joins.blank? ), - ("WHERE #{selects.collect { |s| s.to_sql(Sql::WhereClause.new(self)) }.join("\n\tAND ")}" unless selects.blank? ), - ("ORDER BY #{orders.collect { |o| o.to_sql(Sql::OrderClause.new(self)) }.join(', ')}" unless orders.blank? ), + ("WHERE #{selects.collect { |s| s.to_sql(Sql::WhereClause.new(self)) }.join("\n\tAND ")}" unless selects.blank? ), + ("ORDER BY #{orders.collect { |o| o.to_sql(Sql::OrderClause.new(self)) }.join(', ')}" unless orders.blank? ), ("GROUP BY #{groupings.collect(&:to_sql)}" unless groupings.blank? ), ("LIMIT #{taken}" unless taken.blank? ), ("OFFSET #{skipped}" unless skipped.blank? ) @@ -162,11 +162,6 @@ module Arel self end - # INVESTIGATE - def format(object) - object.to_sql(Sql::WhereCondition.new(self)) - end - def christener self end |