diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-11-13 15:27:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-13 15:27:59 -0500 |
| commit | f49d59432a0b5b4a492fd8464c00edbb5b9a8b7e (patch) | |
| tree | 7bc393854d36c29078f8d6076141523c8abe6f89 /activerecord/lib/active_record/relation | |
| parent | 8dd76a7a6ff1bb7105beabb8f834ca54ab1e5fc2 (diff) | |
| parent | f8627dfee9c15b9875a8ef1b358ed341ec5ce367 (diff) | |
| download | rails-f49d59432a0b5b4a492fd8464c00edbb5b9a8b7e.tar.gz rails-f49d59432a0b5b4a492fd8464c00edbb5b9a8b7e.tar.bz2 rails-f49d59432a0b5b4a492fd8464c00edbb5b9a8b7e.zip | |
Merge pull request #30980 from sobrinho/sobrinho/arel-star-ignored-columns
Do not use `Arel.star` when `ignored_columns`
Diffstat (limited to 'activerecord/lib/active_record/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 34554450dd..1219737e78 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -1038,6 +1038,8 @@ module ActiveRecord def build_select(arel) if select_values.any? arel.project(*arel_columns(select_values.uniq)) + elsif @klass.ignored_columns.any? + arel.project(*arel_columns(@klass.column_names)) else arel.project(table[Arel.star]) end |