diff options
| author | kg8m <takumi.kagiyama@gmail.com> | 2018-02-12 22:56:05 +0900 |
|---|---|---|
| committer | kg8m <takumi.kagiyama@gmail.com> | 2018-02-27 23:05:54 +0900 |
| commit | 2d48268d81644b3b1a558fbdd81941d56dd3d239 (patch) | |
| tree | e34f444f2a46ee79626f241e4722073b5220842c /activerecord/lib/active_record/connection_adapters | |
| parent | f1878fa06efb2eaa2c521022fa79f95b6c49f865 (diff) | |
| download | rails-2d48268d81644b3b1a558fbdd81941d56dd3d239.tar.gz rails-2d48268d81644b3b1a558fbdd81941d56dd3d239.tar.bz2 rails-2d48268d81644b3b1a558fbdd81941d56dd3d239.zip | |
Fix `#columsn_for_distinct` of MySQL and PostgreSQL
Prevent `ActiveRecord::FinderMethods#limited_ids_for` from using correct primary
key values even if `ORDER BY` columns include other table's primary key.
Fixes #28364.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 608258d05c..fbedddd7f9 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -513,7 +513,7 @@ module ActiveRecord s.gsub(/\s+(?:ASC|DESC)\b/i, "") }.reject(&:blank?).map.with_index { |column, i| "#{column} AS alias_#{i}" } - [super, *order_columns].join(", ") + (order_columns << super).join(", ") end def strict_mode? 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 6f3db772cd..45b230f0f9 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -583,7 +583,7 @@ module ActiveRecord .gsub(/\s+NULLS\s+(?:FIRST|LAST)\b/i, "") }.reject(&:blank?).map.with_index { |column, i| "#{column} AS alias_#{i}" } - [super, *order_columns].join(", ") + (order_columns << super).join(", ") end def update_table_definition(table_name, base) # :nodoc: |