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

search: fix multiple metatag searches not working in some cases.

Browse Source 
Bug: in some cases searching for multiple metatags would cause one
metatag to be ignored. For example, a search for {{user:1 pool:2}} would
be treated as a search for {{pool:2}}.

Cause: we used `ActiveRecord::Relation#merge` to combine two relations,
which was wrong because `merge` doesn't combine `column IN (?)` clauses
correctly. If there are two `column IN (?)` clauses on the same column,
then `#merge` takes only the second clause and ignores the first.

Fix: write our own half-baked `#and` method to work around Rails'
broken-by-design `#merge` method.

ref: https://github.com/rails/rails/issues/33501.
This commit is contained in:
evazion
2020-04-27 22:29:42 -05:00
parent 1ccefa613f
commit 8cbcec285d
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/unit/post_query_builder_test.rb
View File

@@ -595,6 +595,7 @@ class PostQueryBuilderTest < ActiveSupport::TestCase
assert_tag_match([post1], "md5:abcd")
assert_tag_match([post1], "md5:ABCD")
assert_tag_match([post1], "md5:123,abcd")
assert_tag_match([], "md5:abcd md5:xyz")
end
should "return posts for a source:<text> search" do
@@ -613,6 +614,8 @@ class PostQueryBuilderTest < ActiveSupport::TestCase
assert_tag_match([post2, post1], "-source:none")
assert_tag_match([], "source:'none'")
assert_tag_match([], "source:none source:abcde")
assert_tag_match([], "source:abcde source:xzy")
end
should "return posts for a pixiv source search" do
@@ -693,6 +696,7 @@ class PostQueryBuilderTest < ActiveSupport::TestCase
assert_tag_match([s], "rating:s")
assert_tag_match([q], "rating:q")
assert_tag_match([e], "rating:e")
assert_tag_match([], "rating:s rating:q")
assert_tag_match(all - [s], "-rating:s")
assert_tag_match(all - [q], "-rating:q")
@@ -726,8 +730,10 @@ class PostQueryBuilderTest < ActiveSupport::TestCase
upvoted = create(:post, tag_string: "upvote:self")
downvoted = create(:post, tag_string: "downvote:self")
assert_tag_match([upvoted], "upvote:#{CurrentUser.name}")
assert_tag_match([upvoted], "upvote:#{CurrentUser.name}")
assert_tag_match([downvoted], "downvote:#{CurrentUser.name}")
assert_tag_match([], "upvote:nobody upvote:#{CurrentUser.name}")
assert_tag_match([], "downvote:nobody downvote:#{CurrentUser.name}")
end
end
@@ -742,6 +748,7 @@ class PostQueryBuilderTest < ActiveSupport::TestCase
assert_tag_match([disapproved], "disapproved:disinterest")
assert_tag_match([disapproved], "disapproved:DISINTEREST")
assert_tag_match([], "disapproved:breaks_rules")
assert_tag_match([], "disapproved:breaks_rules disapproved:disinterest")
assert_tag_match([pending], "-disapproved:#{CurrentUser.name}")
assert_tag_match([pending], "-disapproved:disinterest")
@@ -887,16 +894,13 @@ class PostQueryBuilderTest < ActiveSupport::TestCase
should "succeed for exclusive tag searches with no other tag" do
post1 = create(:post, rating: "s", tag_string: "aaa")
assert_nothing_raised do
relation = Post.tag_match("-aaa")
end
assert_tag_match([], "-aaa")
end
should "succeed for exclusive tag searches combined with a metatag" do
post1 = create(:post, rating: "s", tag_string: "aaa")
assert_nothing_raised do
relation = Post.tag_match("-aaa id:>0")
end
assert_tag_match([], "-aaa id:>0")
assert_tag_match([], "-a* rating:s")
end
end