diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-03-30 20:56:05 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-03-30 20:56:05 -0500 |
| commit | 5df076ad0965dc684afff8a019fd9f92a53ada76 (patch) | |
| tree | b2272d3d7f0ed6713d888390a13b130c65aec6f3 /activerecord/lib/active_record/relation | |
| parent | ac9443ed71bf0b40cf5b321e8e1b77b98abd9b5e (diff) | |
| parent | 9772de8d459960cc114c5b214343b7ce08fea21c (diff) | |
| download | rails-5df076ad0965dc684afff8a019fd9f92a53ada76.tar.gz rails-5df076ad0965dc684afff8a019fd9f92a53ada76.tar.bz2 rails-5df076ad0965dc684afff8a019fd9f92a53ada76.zip | |
Merge branch 'master' into sprockets
Diffstat (limited to 'activerecord/lib/active_record/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index cd1d7108b3..9470e7c6c5 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -261,7 +261,7 @@ module ActiveRecord ) join_nodes.each do |join| - join_dependency.table_aliases[join.left.name.downcase] = 1 + join_dependency.alias_tracker.aliased_name_for(join.left.name.downcase) end join_dependency.graft(*stashed_association_joins) |