diff options
| author | Yves Senn <yves.senn@gmail.com> | 2012-12-02 21:24:47 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@garaio.com> | 2012-12-04 11:52:08 +0100 |
| commit | db51704bd9458635ad82e6a7de56a9fd56db64d4 (patch) | |
| tree | f7e3cf4d528c38145c0e547fd345d2d19823fa6c /activerecord/lib/active_record/relation | |
| parent | c7e4ee79326d81f78cfa3d958a8fce34fde83a15 (diff) | |
| download | rails-db51704bd9458635ad82e6a7de56a9fd56db64d4.tar.gz rails-db51704bd9458635ad82e6a7de56a9fd56db64d4.tar.bz2 rails-db51704bd9458635ad82e6a7de56a9fd56db64d4.zip | |
Do not instantiate intermediate AR objects when eager loading.
Closes #3313
Diffstat (limited to 'activerecord/lib/active_record/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index eafe4a54c4..7ddaea1bb0 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -225,9 +225,11 @@ module ActiveRecord orders = relation.order_values.map { |val| val.presence }.compact values = @klass.connection.distinct("#{quoted_table_name}.#{primary_key}", orders) - relation = relation.dup + relation = relation.dup.select(values) + + id_rows = @klass.connection.select_all(relation.arel, 'SQL', relation.bind_values) + ids_array = id_rows.map {|row| row[primary_key]} - ids_array = relation.select(values).collect {|row| row[primary_key]} ids_array.empty? ? raise(ThrowResult) : table[primary_key].in(ids_array) end |