Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-20 21:11:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix values_list subqueries in Elasticsearch queries

Browse source
This commit is contained in:
Karl Hobley 2017-10-19 16:03:56 +01:00
parent 9931ca5f15
commit 4b96f5eba3
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wagtail/wagtailsearch/backends/elasticsearch.py
View file

@ -5,7 +5,7 @@ import json
from django.db import DEFAULT_DB_ALIAS, models
from django.db.models.sql import Query
from django.db.models.sql.constants import SINGLE
from django.db.models.sql.constants import MULTI
from django.utils.crypto import get_random_string
from django.utils.six.moves.urllib.parse import urlparse
from elasticsearch import Elasticsearch, NotFoundError
@ -280,8 +280,11 @@ class ElasticsearchSearchQuery(BaseSearchQuery):
if lookup == 'in':
if isinstance(value, Query):
db_alias = self.queryset._db or DEFAULT_DB_ALIAS
value = (value.get_compiler(db_alias)
.execute_sql(result_type=SINGLE))
value = next(value.get_compiler(db_alias)
.execute_sql(result_type=MULTI))
value = [r[0] for r in value]
elif not isinstance(value, list):
value = list(value)
return {