From 929bb3d28103d773a93976bfe7500445ba06b1aa Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 8 Jun 2018 15:47:27 +0100 Subject: [PATCH] Reorder query classes --- wagtail/search/query.py | 54 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/wagtail/search/query.py b/wagtail/search/query.py index 25c1fc6d9..6044bdf18 100644 --- a/wagtail/search/query.py +++ b/wagtail/search/query.py @@ -17,33 +17,6 @@ class SearchQuery: return Not(self) -class SearchQueryOperator(SearchQuery): - pass - - -class MultiOperandsSearchQueryOperator(SearchQueryOperator): - def __init__(self, subqueries): - self.subqueries = subqueries - - -# -# Operators -# - - -class And(MultiOperandsSearchQueryOperator): - pass - - -class Or(MultiOperandsSearchQueryOperator): - pass - - -class Not(SearchQueryOperator): - def __init__(self, subquery: SearchQuery): - self.subquery = subquery - - # # Basic query classes # @@ -72,4 +45,31 @@ class Boost(SearchQuery): self.boost = boost +# +# Operators +# + + +class SearchQueryOperator(SearchQuery): + pass + + +class MultiOperandsSearchQueryOperator(SearchQueryOperator): + def __init__(self, subqueries): + self.subqueries = subqueries + + +class And(MultiOperandsSearchQueryOperator): + pass + + +class Or(MultiOperandsSearchQueryOperator): + pass + + +class Not(SearchQueryOperator): + def __init__(self, subquery: SearchQuery): + self.subquery = subquery + + MATCH_ALL = MatchAll()