SearchQuerySet.models() filter not working on ES5

[JClubb3]

• Tested with the latest Haystack release
• Tested with the current Haystack master branch

Expected behaviour

Calling .models() on an SQS will limit results to the specified models.

Actual behaviour

The provided models are ignored. The SQS will always return all matching models.

Steps to reproduce the behaviour

1. Submit an SQS against a dataset for which instances of multiple models should match.
2. Submit this SQS once without calling .models() and check the length.
3. Submit it again while calling .models() and check the length; the two lens will be the same.

>>> a = SearchQuerySet().filter(content="test")
>>> len(a)
7
>>> for s in a.all():
...     print(s)
...
<SearchResult: certapp.comment (pk='7')>
<SearchResult: certapp.comment (pk='1')>
<SearchResult: certapp.comment (pk='2')>
<SearchResult: certapp.comment (pk='6')>
<SearchResult: certapp.comment (pk='9')>
<SearchResult: certapp.featuredocument (pk='4')>
<SearchResult: certapp.featuredocument (pk='6')>
>>> b = a.models(Comment)
>>> len(b)
7
>>> for s in b.all():
...     print(s)
...
<SearchResult: certapp.comment (pk='7')>
<SearchResult: certapp.comment (pk='1')>
<SearchResult: certapp.comment (pk='2')>
<SearchResult: certapp.comment (pk='6')>
<SearchResult: certapp.comment (pk='9')>
<SearchResult: certapp.featuredocument (pk='4')>
<SearchResult: certapp.featuredocument (pk='6')>

Resolution

I did some looking around, and found some code present in ElasticSearchBackend.build_search_kwargs() that had to do with models that is missing in ElasticSearch5Backend.build_search_kwargs(). When I added the code from the former into the latter, my searches work as expected again:

>>> a = SearchQuerySet().filter(content="test")
>>> len(a)
7
>>> b = a.models(Comment)
>>> len(b)
5
>>> for s in b.all():
...     print(s)
...
<SearchResult: certapp.comment (pk='7')>
<SearchResult: certapp.comment (pk='1')>
<SearchResult: certapp.comment (pk='2')>
<SearchResult: certapp.comment (pk='6')>
<SearchResult: certapp.comment (pk='9')>

I will submit a pull request with the code change, though my fix was just a copy and paste.

Configuration

• Operating system version: Ubuntu 18.04
• Search engine version: ElasticSearch 5
• Python version: 3.6.5
• Django version: 2.0.6
• Haystack version: 2.8.1