From 3d9e8d7c110f7053d73f61f2297bd46722294121 Mon Sep 17 00:00:00 2001
From: Ray Zane <raymondzane@gmail.com>
Date: Mon, 13 Feb 2017 23:38:38 -0500
Subject: The AliasTracker#aliased_table_for needs the type caster for the
 joined association, not the join root

---
 .../lib/active_record/associations/alias_tracker.rb   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'activerecord/lib/active_record/associations/alias_tracker.rb')

diff --git a/activerecord/lib/active_record/associations/alias_tracker.rb b/activerecord/lib/active_record/associations/alias_tracker.rb
index 4a5c821607..104de4f69d 100644
--- a/activerecord/lib/active_record/associations/alias_tracker.rb
+++ b/activerecord/lib/active_record/associations/alias_tracker.rb
@@ -4,21 +4,21 @@ module ActiveRecord
   module Associations
     # Keeps track of table aliases for ActiveRecord::Associations::JoinDependency
     class AliasTracker # :nodoc:
-      def self.create(connection, initial_table, type_caster)
+      def self.create(connection, initial_table)
         aliases = Hash.new(0)
         aliases[initial_table] = 1
-        new connection, aliases, type_caster
+        new(connection, aliases)
       end
 
-      def self.create_with_joins(connection, initial_table, joins, type_caster)
+      def self.create_with_joins(connection, initial_table, joins)
         if joins.empty?
-          create(connection, initial_table, type_caster)
+          create(connection, initial_table)
         else
           aliases = Hash.new { |h, k|
             h[k] = initial_count_for(connection, k, joins)
           }
           aliases[initial_table] = 1
-          new connection, aliases, type_caster
+          new(connection, aliases)
         end
       end
 
@@ -51,17 +51,16 @@ module ActiveRecord
       end
 
       # table_joins is an array of arel joins which might conflict with the aliases we assign here
-      def initialize(connection, aliases, type_caster)
+      def initialize(connection, aliases)
         @aliases    = aliases
         @connection = connection
-        @type_caster = type_caster
       end
 
-      def aliased_table_for(table_name, aliased_name)
+      def aliased_table_for(table_name, aliased_name, type_caster)
         if aliases[table_name].zero?
           # If it's zero, we can have our table_name
           aliases[table_name] = 1
-          Arel::Table.new(table_name, type_caster: @type_caster)
+          Arel::Table.new(table_name, type_caster: type_caster)
         else
           # Otherwise, we need to use an alias
           aliased_name = @connection.table_alias_for(aliased_name)
@@ -74,7 +73,7 @@ module ActiveRecord
           else
             aliased_name
           end
-          Arel::Table.new(table_name, type_caster: @type_caster).alias(table_alias)
+          Arel::Table.new(table_name, type_caster: type_caster).alias(table_alias)
         end
       end
 
-- 
cgit v1.2.3