diff options
| author | Cody Cutrer <cody@instructure.com> | 2013-12-16 21:26:37 -0700 |
|---|---|---|
| committer | Cody Cutrer <cody@cutrer.us> | 2013-12-19 14:40:13 -0700 |
| commit | 847e9a95da59f1263e6e5c15cd5ce5c9ec8260a6 (patch) | |
| tree | c47923c5e2de4efd9e12dc0098462f1c491883ad /activerecord/lib | |
| parent | e4cde5d58cbb09d1843796f96ba86225ff94fe05 (diff) | |
| download | rails-847e9a95da59f1263e6e5c15cd5ce5c9ec8260a6.tar.gz rails-847e9a95da59f1263e6e5c15cd5ce5c9ec8260a6.tar.bz2 rails-847e9a95da59f1263e6e5c15cd5ce5c9ec8260a6.zip | |
fix default select when from is used
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index e7b8809fe0..3d0709266a 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -982,8 +982,10 @@ module ActiveRecord end def build_select(arel, selects) - unless selects.empty? + if !selects.empty? arel.project(*selects) + elsif from_value + arel.project(Arel.star) else arel.project(@klass.arel_table[Arel.star]) end |