use the superclass implementation

rails · Jul 18, 2013 · fa1e101 · fa1e101
1 parent 9267a7d
commit fa1e101
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb
@@ -119,7 +119,7 @@ def table_name_for(reflection)
           # the owner
           klass.table_name
         else
-          reflection.table_name
+          super
         end
       end
 

diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
@@ -527,7 +527,9 @@ def through_reflection
       #
       def chain
         @chain ||= begin
-          chain = source_reflection.chain + through_reflection.chain
+          a = source_reflection.chain
+          b = through_reflection.chain
+          chain = a + b
           chain[0] = self # Use self so we don't lose the information from :source_type
           chain
         end