aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-10-14 18:37:18 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-10-14 18:37:18 -0700
commit621c24323ea3226206ed65a16070b97a24a5bc2f (patch)
tree5ba5f3ca4a388d8dfb31dea1737e99221dd16f22 /activerecord/lib/active_record/relation
parenta53c2beac42e0fea5dab9a334a066911beeba976 (diff)
downloadrails-621c24323ea3226206ed65a16070b97a24a5bc2f.tar.gz
rails-621c24323ea3226206ed65a16070b97a24a5bc2f.tar.bz2
rails-621c24323ea3226206ed65a16070b97a24a5bc2f.zip
keep a cache on the alias object
Diffstat (limited to 'activerecord/lib/active_record/relation')
-rw-r--r--activerecord/lib/active_record/relation/finder_methods.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index 5e11ba0325..f7f60635d3 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -255,7 +255,7 @@ module ActiveRecord
[]
else
rows = connection.select_all(relation.arel, 'SQL', relation.bind_values.dup)
- join_dependency.instantiate(rows)
+ join_dependency.instantiate(rows, aliases)
end
end
end