1 files changed, 8 insertions, 32 deletions
diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency.rb
index 5a0ff942ca..78b634a26c 100644
--- a/activerecord/lib/active_record/associations/class_methods/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/class_methods/join_dependency.rb
@@ -6,18 +6,16 @@ module ActiveRecord
   module Associations
     module ClassMethods
       class JoinDependency # :nodoc:
-        attr_reader :join_parts, :reflections, :table_aliases, :active_record
+        attr_reader :join_parts, :reflections, :alias_tracker, :active_record
 
         def initialize(base, associations, joins)
-          @active_record         = base
-          @table_joins           = joins
-          @join_parts            = [JoinBase.new(base)]
-          @associations          = {}
-          @reflections           = []
-          @table_aliases         = Hash.new do |h,name|
-            h[name] = count_aliases_from_table_joins(name.downcase)
-          end
-          @table_aliases[base.table_name] = 1
+          @active_record = base
+          @table_joins   = joins
+          @join_parts    = [JoinBase.new(base)]
+          @associations  = {}
+          @reflections   = []
+          @alias_tracker = AliasTracker.new(joins)
+          @alias_tracker.aliased_name_for(base.table_name) # Updates the count for base.table_name to 1
           build(associations)
         end
 
@@ -46,28 +44,6 @@ module ActiveRecord
           }.flatten
         end
 
-        def count_aliases_from_table_joins(name)
-          return 0 if !@table_joins || Arel::Table === @table_joins
-
-          # quoted_name should be downcased as some database adapters (Oracle) return quoted name in uppercase
-          quoted_name = active_record.connection.quote_table_name(name).downcase
-
-          @table_joins.grep(Arel::Nodes::Join).map { |join|
-            right = join.right
-            case right
-            when Arel::Table
-              right.name.downcase == name ? 1 : 0
-            when String
-              # Table names + table aliases
-              right.downcase.scan(
-                /join(?:\s+\w+)?\s+(\S+\s+)?#{quoted_name}\son/
-              ).size
-            else
-              0
-            end
-          }.sum
-        end
-
         def instantiate(rows)
           primary_key = join_base.aliased_primary_key
           parents = {}