aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/join_dependency/join_part.rb
diff options
context:
space:
mode:
authorGonçalo Silva <goncalossilva@gmail.com>2011-04-03 02:02:35 +0100
committerGonçalo Silva <goncalossilva@gmail.com>2011-04-03 02:02:35 +0100
commit5b2b513742ad909ede8956d6021c0bc521c08ddf (patch)
tree31c1367a433772f9630d034148d005fac95d3051 /activerecord/lib/active_record/associations/join_dependency/join_part.rb
parent677ce63d92b7725b0a11facddc1ba95f50f865df (diff)
parent99da42c29944beed0cb9e892ae90bfeb2590c57e (diff)
downloadrails-5b2b513742ad909ede8956d6021c0bc521c08ddf.tar.gz
rails-5b2b513742ad909ede8956d6021c0bc521c08ddf.tar.bz2
rails-5b2b513742ad909ede8956d6021c0bc521c08ddf.zip
Merge branch 'master' of https://github.com/rails/rails into performance_test
Diffstat (limited to 'activerecord/lib/active_record/associations/join_dependency/join_part.rb')
-rw-r--r--activerecord/lib/active_record/associations/join_dependency/join_part.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_part.rb b/activerecord/lib/active_record/associations/join_dependency/join_part.rb
index 3279e56e7d..2b1d888a9a 100644
--- a/activerecord/lib/active_record/associations/join_dependency/join_part.rb
+++ b/activerecord/lib/active_record/associations/join_dependency/join_part.rb
@@ -22,7 +22,7 @@ module ActiveRecord
end
def aliased_table
- Arel::Nodes::TableAlias.new aliased_table_name, table
+ Arel::Nodes::TableAlias.new table, aliased_table_name
end
def ==(other)