Maintain extra joins for string or complex arel conditions

49bcb00 has changed to maintain extra joins only if other table's
condition is found (e.g. `other_table[:id].eq(table[:foreign_id])`).

It means that cannot maintain extra joins for complex conditions
(especially "(... OR ...)"), so it has caused a regression #37167.

This changes to maintain extra joins for complex conditions too like as
before.

Fixes #37167.
This commit is contained in:
Ryuta Kamizono 2019-10-04 13:14:48 +09:00
parent eae80d7c27
commit 0e76553934
2 changed files with 2 additions and 2 deletions

View File

@ -37,7 +37,7 @@ module ActiveRecord
nodes = arel.constraints.first
others = nodes.children.extract! do |node|
Arel.fetch_attribute(node) { |attr| attr.relation.name != table.name }
!Arel.fetch_attribute(node) { |attr| attr.relation.name == table.name }
end
joins << table.create_join(table, table.create_on(nodes), join_type)

View File

@ -3,6 +3,6 @@
class Rating < ActiveRecord::Base
belongs_to :comment
has_many :taggings, as: :taggable
has_many :taggings_without_tag, -> { left_joins(:tag).where("tags.id": nil) }, as: :taggable, class_name: "Tagging"
has_many :taggings_without_tag, -> { left_joins(:tag).where("tags.id": [nil, 0]) }, as: :taggable, class_name: "Tagging"
has_many :taggings_with_no_tag, -> { joins("LEFT OUTER JOIN tags ON tags.id = taggings.tag_id").where("tags.id": nil) }, as: :taggable, class_name: "Tagging"
end