mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-31 07:47:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improved SearchVectorCombinable and SearchQueryCombinable error messages.

Browse source
This commit is contained in:
Hannes Ljungberg 2020-01-24 22:23:30 +00:00 • committed by Mariusz Felisiak
parent 50cf183d21
commit 7edd06a9cf
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/postgres_tests/test_search.py
View file

@ -289,6 +289,14 @@ class TestCombinations(GrailTestData, PostgreSQLTestCase):
).filter(search='bedemir')
self.assertCountEqual(searched, [self.bedemir0, self.bedemir1, self.crowd, self.witch, self.duck])
def test_vector_combined_mismatch(self):
msg = (
'SearchVector can only be combined with other SearchVector '
'instances, got NoneType.'
)
with self.assertRaisesMessage(TypeError, msg):
Line.objects.filter(dialogue__search=None + SearchVector('character__name'))
def test_query_and(self):
searched = Line.objects.annotate(
search=SearchVector('scene__setting', 'dialogue'),
@ -340,7 +348,10 @@ class TestCombinations(GrailTestData, PostgreSQLTestCase):
self.assertCountEqual(searched, [self.verse0, self.verse1, self.verse2])
def test_query_combined_mismatch(self):
msg = "SearchQuery can only be combined with other SearchQuerys, got"
msg = (
'SearchQuery can only be combined with other SearchQuery '
'instances, got NoneType.'
)
with self.assertRaisesMessage(TypeError, msg):
Line.objects.filter(dialogue__search=None | SearchQuery('kneecaps'))