diff options
| author | kennyj <kennyj@gmail.com> | 2012-02-25 23:01:43 +0900 |
|---|---|---|
| committer | kennyj <kennyj@gmail.com> | 2012-02-25 23:01:43 +0900 |
| commit | 404b73bce1f9347ca05b1496db8fc64438d66bd2 (patch) | |
| tree | 5ce9e6aa1390115d9ee9f34767e8416c80ecf478 /activerecord/lib/active_record/connection_adapters | |
| parent | 862e27fbbb31923c1e56b669914b24a3073674b4 (diff) | |
| download | rails-404b73bce1f9347ca05b1496db8fc64438d66bd2.tar.gz rails-404b73bce1f9347ca05b1496db8fc64438d66bd2.tar.bz2 rails-404b73bce1f9347ca05b1496db8fc64438d66bd2.zip | |
Remove NULLS FIRST/LAST. closes #5152
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -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 c675b64a26..d2126a3e19 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -1189,7 +1189,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.gsub(/\s+(ASC|DESC)\s*/i, '') } + order_columns = orders.collect { |s| s.gsub(/\s+(ASC|DESC)\s*(NULLS\s+(FIRST|LAST)\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}" } |