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

search: move query parsing code from tag model to post query builder.

Browse Source
This commit is contained in:
evazion
2020-03-06 21:14:50 -06:00
parent 2e0ad42eca
commit 967d398c8e
13 changed files with 583 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/logical/concerns/searchable.rb
View File

@@ -64,7 +64,7 @@ module Searchable
def where_array_count(attr, value)
relation = all
qualified_column = "cardinality(#{qualified_column_for(attr)})"
parsed_range = Tag.parse_helper(value, :integer)
parsed_range = PostQueryBuilder.parse_helper(value, :integer)
PostQueryBuilder.new(nil).add_range_relation(parsed_range, qualified_column, relation)
end
@@ -96,7 +96,7 @@ module Searchable
column = column_for_attribute(attribute)
qualified_column = "#{table_name}.#{column.name}"
parsed_range = Tag.parse_helper(range, column.type)
parsed_range = PostQueryBuilder.parse_helper(range, column.type)
PostQueryBuilder.new(nil).add_range_relation(parsed_range, qualified_column, self)
end
@@ -252,7 +252,7 @@ module Searchable
def apply_default_order(params)
if params[:order] == "custom"
parse_ids = Tag.parse_helper(params[:id])
parse_ids = PostQueryBuilder.parse_helper(params[:id])
if parse_ids[0] == :in
return find_ordered(parse_ids[1])
end