コミットを比較

..
2 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker 62f501be2e AI: address review on PR #461 2026-11-12 18:55:43 +09:00
Codex Night Worker da63b46d4b AI: address issue #443 2026-11-12 12:37:23 +09:00
2個のファイルの変更、20行の追加、12行の削除
+20 -7
ファイルの表示
@@ -3,8 +3,8 @@ class PostTagSearch
def self.literals(locale, raw) def self.literals(locale, raw)
tokens = raw.split.reject { _1.downcase == 'type:or' } tokens = raw.split.reject { _1.downcase == 'type:or' }
names = tokens.map { _1.sub(/\Anot:/i, '') } names = tokens.map { _1.sub(/\Anot:/i, '') }
registered = TagName.where(language_code: locale.language_code, name: names) registered = matching_names(TagName.where(language_code: locale.language_code),
.pluck(:name, :tag_id).to_h names, 'tag_names.name', :tag_id).to_h
primary = TagName.where(language_code: locale.language_code, primary = TagName.where(language_code: locale.language_code,
tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h
tokens.zip(names).map do |token, name| tokens.zip(names).map do |token, name|
@@ -19,12 +19,25 @@ class PostTagSearch
def self.references_for(locale, literals) def self.references_for(locale, literals)
names = literals.map { _1[:name] }.uniq names = literals.map { _1[:name] }.uniq
internal = TagName.where(language_code: locale.language_code, name: names) internal = matching_names(TagName.where(language_code: locale.language_code),
.pluck(:name, :tag_id).group_by(&:first) names, 'tag_names.name', :tag_id).group_by(&:first)
external = names.empty? ? {} : ExternalTag.where( external = matching_names(ExternalTag.all, names,
"CONCAT(platform, ':', name) IN (?)", names) "CONCAT(external_tags.platform, ':', external_tags.name)", :id).group_by(&:first)
.pluck(Arel.sql("CONCAT(platform, ':', name)"), :id).group_by(&:first)
names.to_h { |name| [name, [internal.fetch(name, []).map(&:last).uniq, names.to_h { |name| [name, [internal.fetch(name, []).map(&:last).uniq,
external.fetch(name, []).map(&:last).uniq]] } external.fetch(name, []).map(&:last).uniq]] }
end end
def self.matching_names(scope, names, expression, identifier)
return [] if names.empty?
queries = names.uniq.map do |name|
scope.klass.sanitize_sql_array(['SELECT ? AS name', name])
end
# Return the input spelling so Ruby does not recheck database equivalence.
scope.joins(<<~SQL).pluck(Arel.sql('search_names.name'), identifier)
INNER JOIN (#{ queries.join(' UNION ALL ') }) AS search_names
ON #{ expression } = search_names.name COLLATE utf8mb4_0900_ai_ci
SQL
end
private_class_method :matching_names
end end
-5
ファイルの表示
@@ -1,5 +0,0 @@
class AddForeignKeyOnDeerjikistsTagId < ActiveRecord::Migration[8.0]
def change
add_foreign_key :deerjikists, :tags, column: :tag_id
end
end