diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-02-28 00:46:52 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-02-28 00:47:59 +0900 |
| commit | 6717d6027ce7f6383baf6c78115debdbcf2348ac (patch) | |
| tree | 395e91e1df9120fe7acc7a2dbd56395b3fecd871 /activerecord/lib/active_record/connection_adapters | |
| parent | 0605f45ab323331b06dde3ed16838f56f141ca3f (diff) | |
| parent | 2d48268d81644b3b1a558fbdd81941d56dd3d239 (diff) | |
| download | rails-6717d6027ce7f6383baf6c78115debdbcf2348ac.tar.gz rails-6717d6027ce7f6383baf6c78115debdbcf2348ac.tar.bz2 rails-6717d6027ce7f6383baf6c78115debdbcf2348ac.zip | |
Merge pull request #31966 from kg8m/fix_limited_ids_for
Use column alias of primary_key in limited_ids_for
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: |