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

posts: fix exception in random:1 searches.

Browse Source 
Fix regression in 1ad0e8688. Caused by `relation.order_values` returning
an array of Arel nodes instead of an array of strings when doing a
`random:1` search.
This commit is contained in:
evazion
2022-03-21 01:27:53 -05:00
parent f52dc9e2ad
commit defea08084
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/post_query_builder.rb
View File

@@ -542,7 +542,9 @@ class PostQueryBuilder
# better. # better.
def optimize_search(relation, small_search_threshold) def optimize_search(relation, small_search_threshold)
return relation unless small_search_threshold.present? return relation unless small_search_threshold.present?
return relation unless relation.order_values.map(&:downcase).in?([["posts.id desc"], ["posts.id asc"]])
order_values = relation.order_values.map { |order| order.try(:to_sql) || order.to_s }.map(&:downcase)
return relation unless order_values.in?([["posts.id desc"], ["posts.id asc"]])
if post_count.nil? if post_count.nil?
# If post_count is nil, then the search took too long to count and we don't # If post_count is nil, then the search took too long to count and we don't

3
test/functional/posts_controller_test.rb
View File

@@ -323,6 +323,9 @@ class PostsControllerTest < ActionDispatch::IntegrationTest
get posts_path, params: { tags: "order:random" } get posts_path, params: { tags: "order:random" }
assert_response :success assert_response :success
get posts_path(tags: "random:1")
assert_response :success
get posts_path(random: "1") get posts_path(random: "1")
assert_redirected_to posts_path(tags: "random:20", format: :html) assert_redirected_to posts_path(tags: "random:20", format: :html)