Push source_type and polymorphic conditions out of ThroughAssociation and JoinDependency::JoinAssociation and into the reflection instead.

3 files changed, 11 insertions, 45 deletions

diff --git a/activerecord/lib/active_record/associations/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
index 890e77fca9..5da3416023 100644
--- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb
+++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
@@ -76,8 +76,6 @@ module ActiveRecord
                 when :has_many, :has_one
                   key         = reflection.foreign_key
                   foreign_key = reflection.active_record_primary_key
-
-                  conditions << polymorphic_conditions(reflection, table)
                 when :has_and_belongs_to_many
                   # For habtm, we need to deal with the join table at the same time as the
                   # target table (because unlike a :through association, there is no reflection
@@ -103,8 +101,6 @@ module ActiveRecord
                 when :belongs_to
                   key         = reflection.association_primary_key
                   foreign_key = reflection.foreign_key
-
-                  conditions << source_type_conditions(reflection, foreign_table)
                 when :has_many, :has_one
                   key         = reflection.foreign_key
                   foreign_key = reflection.source_reflection.active_record_primary_key
@@ -239,20 +235,6 @@ module ActiveRecord
           end
         end
 
-        def source_type_conditions(reflection, foreign_table)
-          if reflection.options[:source_type]
-            foreign_table[reflection.source_reflection.foreign_type].
-              eq(reflection.options[:source_type])
-          end
-        end
-
-        def polymorphic_conditions(reflection, table)
-          if reflection.options[:as]
-            table[reflection.type].
-              eq(reflection.active_record.base_class.name)
-          end
-        end
-
       end
     end
   end
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb
index 8e9259a28d..11263d5def 100644
--- a/activerecord/lib/active_record/associations/through_association.rb
+++ b/activerecord/lib/active_record/associations/through_association.rb
@@ -89,7 +89,6 @@ module ActiveRecord
                     right_table,
                     left_table[left.foreign_key],
                     right_table[right.association_primary_key],
-                    polymorphic_conditions(left, left),
                     reflection_conditions(right_index)
                   )
                 when :has_and_belongs_to_many
@@ -107,7 +106,6 @@ module ActiveRecord
                     right_table,
                     left_table[left.association_primary_key],
                     right_table[left.foreign_key],
-                    source_type_conditions(left),
                     reflection_conditions(right_index)
                   )
                 when :has_many, :has_one
@@ -119,7 +117,6 @@ module ActiveRecord
                     right_table,
                     left_table[left.foreign_key],
                     right_table[left.source_reflection.active_record_primary_key],
-                    polymorphic_conditions(left, left.source_reflection),
                     reflection_conditions(right_index)
                   )
 
@@ -254,20 +251,6 @@ module ActiveRecord
           end
         end
 
-        def polymorphic_conditions(reflection, polymorphic_reflection)
-          if polymorphic_reflection.options[:as]
-            tables[reflection][polymorphic_reflection.type].
-              eq(polymorphic_reflection.active_record.base_class.name)
-          end
-        end
-
-        def source_type_conditions(reflection)
-          if reflection.options[:source_type]
-            tables[reflection.through_reflection][reflection.foreign_type].
-              eq(reflection.options[:source_type])
-          end
-        end
-
         # TODO: Think about this in the context of nested associations
         def stale_state
           if through_reflection.macro == :belongs_to
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 7ae9bfc928..82f648b873 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -270,7 +270,9 @@ module ActiveRecord
       end
 
       def through_conditions
-        [Array.wrap(options[:conditions])]
+        through_conditions = [Array.wrap(options[:conditions])]
+        through_conditions.first << { type => active_record.base_class.name } if options[:as]
+        through_conditions
       end
 
       def source_reflection
@@ -453,20 +455,19 @@ module ActiveRecord
       # itself an array of conditions from an arbitrary number of relevant reflections.
       def through_conditions
         @through_conditions ||= begin
-          # Initialize the first item - which corresponds to this reflection - either by recursing
-          # into the souce reflection (if it is itself a through reflection), or by grabbing the
-          # source reflection conditions.
-          if source_reflection.source_reflection
-            conditions = source_reflection.through_conditions
-          else
-            conditions = [Array.wrap(source_reflection.options[:conditions])]
-          end
+          conditions = source_reflection.through_conditions
 
           # Add to it the conditions from this reflection if necessary.
           conditions.first << options[:conditions] if options[:conditions]
 
+          through_conditions = through_reflection.through_conditions
+
+          if options[:source_type]
+            through_conditions.first << { foreign_type => options[:source_type] }
+          end
+
           # Recursively fill out the rest of the array from the through reflection
-          conditions += through_reflection.through_conditions
+          conditions += through_conditions
 
           # And return
           conditions