diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-24 13:09:33 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-24 13:09:33 -0700 |
| commit | d6413f043ce132618c7b3d50301d66eac339f997 (patch) | |
| tree | 4486b0a0584398620d2fb7c20525c10c9c8d1dc7 /activerecord/lib | |
| parent | 7ca1a3d2aa1398ed3021f00d67e7e3fa86b600b9 (diff) | |
| parent | 9734a416faaa8149fa5914b0afe2e6761ad5ec20 (diff) | |
| download | rails-d6413f043ce132618c7b3d50301d66eac339f997.tar.gz rails-d6413f043ce132618c7b3d50301d66eac339f997.tar.bz2 rails-d6413f043ce132618c7b3d50301d66eac339f997.zip | |
Merge pull request #1848 from raviolicode/postgresql_order_multiple_params
Fix for complex ordering of multiple columns on postgresql
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 6d638628df..29dd0a9ea3 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -940,7 +940,7 @@ module ActiveRecord # Construct a clean list of column names from the ORDER BY clause, removing # any ASC/DESC modifiers - order_columns = orders.collect { |s| s =~ /^(.+)\s+(ASC|DESC)\s*$/i ? $1 : s } + order_columns = orders.collect { |s| s.gsub(/\s+(ASC|DESC)\s*/i, '') } order_columns.delete_if { |c| c.blank? } order_columns = order_columns.zip((0...order_columns.size).to_a).map { |s,i| "#{s} AS alias_#{i}" } |