diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-17 10:49:38 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-17 10:49:38 -0300 |
| commit | a2075f4142355900bf9e3d19c70248f614363a39 (patch) | |
| tree | 889e2dc249c9e8e9625b4a635e61bc471306cf82 /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | c507f9f4c96ffb19345759bde3e871509c9a905e (diff) | |
| download | rails-a2075f4142355900bf9e3d19c70248f614363a39.tar.gz rails-a2075f4142355900bf9e3d19c70248f614363a39.tar.bz2 rails-a2075f4142355900bf9e3d19c70248f614363a39.zip | |
Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"
This reverts commit 3ea840355409dc205a9e0d027fc09f1452636969, reversing
changes made to e4cde5d58cbb09d1843796f96ba86225ff94fe05.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/relation/query_methods.rb
Reason: using `from` without `select` should not change the select list
to SELECT * because it can lead different query results. If it is needed
to change the table to a subquery or a view you can pass a table alias
in the `from` call or use `select('subquery.*')`.
Fixes #14049.
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index e2a1af7342..5d38f0dce8 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -995,8 +995,6 @@ module ActiveRecord columns_hash.key?(field.to_s) ? arel_table[field] : field end arel.project(*expanded_select) - elsif from_value - arel.project(Arel.star) else arel.project(@klass.arel_table[Arel.star]) end |