diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-05-30 11:51:14 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-05-30 11:51:14 +0200 |
| commit | 6c2b569660c9216595d02ce6412e3bdcc7293317 (patch) | |
| tree | e7d4ada8e9b88f2fa32278e47c82ba807d4be229 /activerecord/lib/active_record/connection_adapters | |
| parent | f1eddea1e3f6faf93581c43651348f48b2b7d8bb (diff) | |
| parent | 1cb52a1733e693fdc76cf92b5408c204b29edcce (diff) | |
| download | rails-6c2b569660c9216595d02ce6412e3bdcc7293317.tar.gz rails-6c2b569660c9216595d02ce6412e3bdcc7293317.tar.bz2 rails-6c2b569660c9216595d02ce6412e3bdcc7293317.zip | |
Merge pull request #11896 from nkondratyev/fix_pg_columns_for_distinct
Fixed #columns_for_distinct of postgresql adapter
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -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 dc994cb7be..0eaaa97454 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -497,7 +497,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(', ') |