diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-09-30 20:07:09 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-09-30 20:07:09 +0900 |
| commit | c83f28fffe8b18ee75822394a11f446c05f692fd (patch) | |
| tree | 85c65a0c0e94f2e29dab82c5ae486e8283690130 /activerecord/lib | |
| parent | 5349f231089ddb884c7cb5405e74b7871383d65d (diff) | |
| download | rails-c83f28fffe8b18ee75822394a11f446c05f692fd.tar.gz rails-c83f28fffe8b18ee75822394a11f446c05f692fd.tar.bz2 rails-c83f28fffe8b18ee75822394a11f446c05f692fd.zip | |
Ensure `AliasTracker` respects a custom table name
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_scope.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb index b2dc044312..6118cef913 100644 --- a/activerecord/lib/active_record/associations/association_scope.rb +++ b/activerecord/lib/active_record/associations/association_scope.rb @@ -23,7 +23,7 @@ module ActiveRecord reflection = association.reflection scope = klass.unscoped owner = association.owner - alias_tracker = AliasTracker.create(klass.connection, klass.table_name) + alias_tracker = AliasTracker.create(klass.connection, scope.table.name) chain = get_chain(reflection, association, alias_tracker) scope.extending! reflection.extensions diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index 77b3d11b47..23741b2f6a 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -91,7 +91,7 @@ module ActiveRecord # joins # => [] # def initialize(base, table, associations, joins, eager_loading: true) - @alias_tracker = AliasTracker.create_with_joins(base.connection, base.table_name, joins) + @alias_tracker = AliasTracker.create_with_joins(base.connection, table.name, joins) @eager_loading = eager_loading tree = self.class.make_tree associations @join_root = JoinBase.new(base, table, build(tree, base)) |