IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Revert recursively tag lookup with missing ancestor tags (#18439)

Browse Source 
This reverts commit 049f8569d8.

To be revisited with a more comprehensive solution covering parent
selection when multiple parents exist.
This commit is contained in:
Selase Krakani
2022-09-30 08:28:09 +00:00
committed by GitHub
parent 58cc35fc78
commit 0c38757250
2 changed files with 8 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/discourse_tagging.rb
View File

@@ -13,29 +13,6 @@ module DiscourseTagging
ON tgm.tag_group_id = tg.id
SQL
ANCESTOR_TAG_IDS_SQL ||= <<~SQL
WITH RECURSIVE ancestors AS (
SELECT
tgm.tag_id,
tg.parent_tag_id
FROM
tag_group_memberships tgm
INNER JOIN tag_groups tg ON tg.id = tgm.tag_group_id
WHERE
tg.parent_tag_id IS NOT NULL
AND tgm.tag_id IN (:tag_ids)
UNION
SELECT
tgm.tag_id,
tg.parent_tag_id
FROM
tag_group_memberships tgm
INNER JOIN tag_groups tg ON tg.id = tgm.tag_group_id
INNER JOIN ancestors ON tgm.tag_id = ancestors.parent_tag_id
)
SELECT * FROM ancestors
SQL
def self.tag_topic_by_names(topic, guardian, tag_names_arg, append: false)
if guardian.can_tag?(topic)
tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, guardian) || []
@@ -116,7 +93,14 @@ module DiscourseTagging
# add missing mandatory parent tags
tag_ids = tags.map(&:id)
parent_tags_map = DB.query(ANCESTOR_TAG_IDS_SQL, tag_ids: tag_ids).inject({}) do |h, v|
parent_tags_map = DB.query("
SELECT tgm.tag_id, tg.parent_tag_id
FROM tag_groups tg
INNER JOIN tag_group_memberships tgm
ON tgm.tag_group_id = tg.id
WHERE tg.parent_tag_id IS NOT NULL
AND tgm.tag_id IN (?)
", tag_ids).inject({}) do |h, v|
h[v.tag_id] ||= []
h[v.tag_id] << v.parent_tag_id
h