diff options
| author | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-03-16 17:27:40 -0700 |
|---|---|---|
| committer | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-03-16 17:27:40 -0700 |
| commit | 7bd0d634867ccbdf4537ba3d62b865b1cb7beebf (patch) | |
| tree | f469465c385a99722b2263cae5f68a1a961a3c76 /lib/active_relation/relations | |
| parent | aa5c9a19826c84bbb9c9f75f8d1a4b04b874780c (diff) | |
| download | rails-7bd0d634867ccbdf4537ba3d62b865b1cb7beebf.tar.gz rails-7bd0d634867ccbdf4537ba3d62b865b1cb7beebf.tar.bz2 rails-7bd0d634867ccbdf4537ba3d62b865b1cb7beebf.zip | |
allowing string passthrough for order clauses
Diffstat (limited to 'lib/active_relation/relations')
| -rw-r--r-- | lib/active_relation/relations/relation.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/active_relation/relations/relation.rb b/lib/active_relation/relations/relation.rb index 1364911f0c..fa66bd039b 100644 --- a/lib/active_relation/relations/relation.rb +++ b/lib/active_relation/relations/relation.rb @@ -105,12 +105,12 @@ module ActiveRelation formatter.select [ "SELECT #{attributes.collect { |a| a.to_sql(Sql::SelectExpression.new(engine)) }.join(', ')}", "FROM #{table_sql}", - (joins unless joins.blank? ), - ("WHERE #{selects.collect {|s| s.to_sql(Sql::WhereClause.new(engine))}.join("\n\tAND ")}" unless selects.blank? ), - ("ORDER BY #{orders.collect(&:to_sql)}" unless orders.blank? ), - ("GROUP BY #{groupings.collect(&:to_sql)}" unless groupings.blank? ), - ("LIMIT #{limit}" unless limit.blank? ), - ("OFFSET #{offset}" unless offset.blank? ) + (joins unless joins.blank? ), + ("WHERE #{selects.collect { |s| s.to_sql(Sql::WhereClause.new(engine)) }.join("\n\tAND ")}" unless selects.blank? ), + ("ORDER BY #{orders.collect { |o| o.to_sql(Sql::OrderClause.new(engine)) }.join(', ')}" unless orders.blank? ), + ("GROUP BY #{groupings.collect(&:to_sql)}" unless groupings.blank? ), + ("LIMIT #{limit}" unless limit.blank? ), + ("OFFSET #{offset}" unless offset.blank? ) ].compact.join("\n"), self.alias end alias_method :to_s, :to_sql |