jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pools: fix crash in post_tags_match search option.

Browse Source 
Fix exception in /pools/search[post_tags_match]=touhou. Caused by
`Pool.post_tags_match(query).count` generating invalid SQL (`count`
doesn't like the top-level cross join).

ref: https://danbooru.donmai.us/forum_topics/9127?page=289#forum_post_161821
This commit is contained in:
evazion
2019-12-27 12:53:46 -06:00
parent 3bcc503cf7
commit 514b736a07
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/pool.rb
View File

@@ -51,7 +51,8 @@ class Pool < ApplicationRecord
def post_tags_match(query) def post_tags_match(query)
posts = Post.tag_match(query).select(:id).reorder(nil) posts = Post.tag_match(query).select(:id).reorder(nil)
joins("CROSS JOIN unnest(post_ids) AS post_id").group(:id).where("post_id IN (?)", posts) pools = Pool.joins("CROSS JOIN unnest(post_ids) AS post_id").group(:id).where("post_id IN (?)", posts)
where(id: pools)
end end
def default_order def default_order

4
test/unit/pool_test.rb
View File

@@ -87,6 +87,10 @@ class PoolTest < ActiveSupport::TestCase
assert_equal([@pool2.id, @pool1.id], Pool.search(post_tags_match: "bkub").pluck(:id)) assert_equal([@pool2.id, @pool1.id], Pool.search(post_tags_match: "bkub").pluck(:id))
assert_equal([@pool2.id, @pool1.id], Pool.search(post_tags_match: "fumimi").pluck(:id)) assert_equal([@pool2.id, @pool1.id], Pool.search(post_tags_match: "fumimi").pluck(:id))
assert_equal([@pool2.id], Pool.search(post_tags_match: "bkub fumimi").pluck(:id)) assert_equal([@pool2.id], Pool.search(post_tags_match: "bkub fumimi").pluck(:id))
assert_equal(2, Pool.search(post_tags_match: "bkub").count)
assert_equal(2, Pool.search(post_tags_match: "fumimi").count)
assert_equal(1, Pool.search(post_tags_match: "bkub fumimi").count)
end end
end end