From 37f2b77e815c59cb19d637addf15c2097022ba08 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@kaed.uk>
Date: Fri, 8 Jun 2018 15:19:34 +0100
Subject: [PATCH] Remove shortcut queries

---
 wagtail/contrib/postgres_search/backend.py |  5 +----
 wagtail/search/backends/db.py              |  5 +----
 wagtail/search/query.py                    | 12 ------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/wagtail/contrib/postgres_search/backend.py b/wagtail/contrib/postgres_search/backend.py
index 7fffb9c440..d8ae001e8e 100644
--- a/wagtail/contrib/postgres_search/backend.py
+++ b/wagtail/contrib/postgres_search/backend.py
@@ -12,8 +12,7 @@ from django.utils.encoding import force_text
 from wagtail.search.backends.base import (
     BaseSearchBackend, BaseSearchQueryCompiler, BaseSearchResults, FilterFieldError)
 from wagtail.search.index import RelatedFields, SearchField, get_indexed_models
-from wagtail.search.query import (
-    And, Boost, MatchAll, Not, Or, PlainText, Prefix, SearchQueryShortcut, Term)
+from wagtail.search.query import And, Boost, MatchAll, Not, Or, PlainText, Prefix, Term
 from wagtail.search.utils import ADD, AND, OR
 
 from .models import SearchAutocomplete as PostgresSearchAutocomplete
@@ -249,8 +248,6 @@ class PostgresSearchQueryCompiler(BaseSearchQueryCompiler):
         if isinstance(query, Boost):
             boost *= query.boost
             return self.build_database_query(query.subquery, config, boost=boost)
-        if isinstance(query, SearchQueryShortcut):
-            return self.build_database_query(query.get_equivalent(), config, boost=boost)
         if isinstance(query, Prefix):
             self.check_boost(query, boost=boost)
             self.is_autocomplete = True
diff --git a/wagtail/search/backends/db.py b/wagtail/search/backends/db.py
index 48a7c56c0a..bf9eb7fce2 100644
--- a/wagtail/search/backends/db.py
+++ b/wagtail/search/backends/db.py
@@ -7,8 +7,7 @@ from django.db.models.expressions import Value
 
 from wagtail.search.backends.base import (
     BaseSearchBackend, BaseSearchQueryCompiler, BaseSearchResults, FilterFieldError)
-from wagtail.search.query import (
-    And, Boost, MatchAll, Not, Or, PlainText, Prefix, SearchQueryShortcut, Term)
+from wagtail.search.query import And, Boost, MatchAll, Not, Or, PlainText, Prefix, Term
 from wagtail.search.utils import AND, OR
 
 
@@ -80,8 +79,6 @@ class DatabaseSearchQueryCompiler(BaseSearchQueryCompiler):
         if isinstance(self.query, MatchAll):
             return models.Q()
 
-        if isinstance(query, SearchQueryShortcut):
-            return self.build_database_filter(query.get_equivalent(), boost=boost)
         if isinstance(query, Term):
             self.check_boost(query)
             return self.build_single_term_filter(query.term)
diff --git a/wagtail/search/query.py b/wagtail/search/query.py
index 9321c49306..413e71b263 100644
--- a/wagtail/search/query.py
+++ b/wagtail/search/query.py
@@ -54,13 +54,6 @@ class MultiOperandsSearchQueryOperator(SearchQueryOperator):
         yield from self.subqueries
 
 
-class SearchQueryShortcut(SearchQuery):
-    def get_equivalent(self):
-        raise NotImplementedError
-
-    def get_children(self):
-        yield self.get_equivalent()
-
 #
 # Operators
 #
@@ -149,9 +142,4 @@ class Fuzzy(SearchQuery):
         return func(self.__class__(self.term, self.max_distance, self.boost))
 
 
-#
-# Shortcut query classes
-#
-
-
 MATCH_ALL = MatchAll()