diff options
| author | Nikolay Kondratyev <nkondratyev@yandex.ru> | 2013-08-14 17:44:14 +0600 |
|---|---|---|
| committer | Nikolay Kondratyev <nkondratyev@yandex.ru> | 2013-08-15 14:14:37 +0600 |
| commit | 1cb52a1733e693fdc76cf92b5408c204b29edcce (patch) | |
| tree | 19d0c469ff0ec9cec34075a6c24c1be27c702cfc /activerecord/lib/active_record | |
| parent | e90f0e0eb68825b7a07e2f468272a138107154c3 (diff) | |
| download | rails-1cb52a1733e693fdc76cf92b5408c204b29edcce.tar.gz rails-1cb52a1733e693fdc76cf92b5408c204b29edcce.tar.bz2 rails-1cb52a1733e693fdc76cf92b5408c204b29edcce.zip | |
Fixed `columns_for_distinct` of postgresql adapter
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb index 3fce8de1ba..203a232258 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -475,7 +475,7 @@ module ActiveRecord # Convert Arel node to string s = s.to_sql unless s.is_a?(String) # Remove any ASC/DESC modifiers - s.gsub(/\s+(ASC|DESC)\s*(NULLS\s+(FIRST|LAST)\s*)?/i, '') + s.gsub(/\s+(?:ASC|DESC)?\s*(?:NULLS\s+(?:FIRST|LAST)\s*)?/i, '') }.reject(&:blank?).map.with_index { |column, i| "#{column} AS alias_#{i}" } [super, *order_columns].join(', ') |