From 28c29973aa143735333f658910b882cf265db692 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 6 Jul 2016 00:30:50 +0900 Subject: Remove circular join references in join_dependency Fixes #25653. --- .../active_record/associations/join_dependency/join_association.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/associations/join_dependency/join_association.rb') 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 c5fbe0d1d1..bdf77009eb 100644 --- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb +++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb @@ -56,7 +56,9 @@ module ActiveRecord klass_scope = if klass.current_scope - klass.current_scope.clone + klass.current_scope.clone.tap { |scope| + scope.joins_values = [] + } else relation = ActiveRecord::Relation.create( klass, -- cgit v1.2.3