aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/join_dependency.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-11-25 12:55:34 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2014-11-25 12:55:34 -0200
commit33a068299bc418833d9e18d535c592cfd420b816 (patch)
tree302119c032ddb17e6b6e818496de484e906a6d45 /activerecord/lib/active_record/associations/join_dependency.rb
parentc310be0e8b800d01446fbd393f1a14adb1b45179 (diff)
parent9e7037f19865021030893880b16be7b1ecbd3470 (diff)
downloadrails-33a068299bc418833d9e18d535c592cfd420b816.tar.gz
rails-33a068299bc418833d9e18d535c592cfd420b816.tar.bz2
rails-33a068299bc418833d9e18d535c592cfd420b816.zip
Merge pull request #17754 from eileencodes/refactor-aliased_table_for
Combine aliased_table_for and aliased_name_for
Diffstat (limited to 'activerecord/lib/active_record/associations/join_dependency.rb')
-rw-r--r--activerecord/lib/active_record/associations/join_dependency.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index c5c4edd090..285d0ec9af 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -94,7 +94,7 @@ module ActiveRecord
#
def initialize(base, associations, joins)
@alias_tracker = AliasTracker.create(base.connection, joins)
- @alias_tracker.aliased_name_for(base.table_name, base.table_name) # Updates the count for base.table_name to 1
+ @alias_tracker.aliased_table_for(base.table_name, base.table_name) # Updates the count for base.table_name to 1
tree = self.class.make_tree associations
@join_root = JoinBase.new base, build(tree, base)
@join_root.children.each { |child| construct_tables! @join_root, child }