2 files changed, 6 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index 4d1f7a1041..d0c920ce4c 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -76,17 +76,17 @@ module ActiveRecord
       end
 
       def reflections
-        join_root.drop(1).map(&:reflection)
+        join_root.drop(1).map!(&:reflection)
       end
 
       def join_relation(relation)
-        join_root.drop(1).inject(relation) do |rel,association|
+        join_root.inject(relation) do |rel,association|
           association.join_relation(rel)
         end
       end
 
       def join_constraints
-        join_root.drop(1).flat_map(&:join_constraints)
+        join_root.flat_map(&:join_constraints)
       end
 
       def columns
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_part.rb b/activerecord/lib/active_record/associations/join_dependency/join_part.rb
index 27304acceb..d536eaf613 100644
--- a/activerecord/lib/active_record/associations/join_dependency/join_part.rb
+++ b/activerecord/lib/active_record/associations/join_dependency/join_part.rb
@@ -29,6 +29,9 @@ module ActiveRecord
           @children = []
         end
 
+        def join_constraints; []; end
+        def join_relation(rel); rel; end
+
         def name
           reflection.name
         end