From 4c6ab1f2aa2a99d17ab308c0156f971a13d3fcaf Mon Sep 17 00:00:00 2001 From: adamb70 Date: Wed, 5 Feb 2020 01:51:13 +0000 Subject: Fixed #28528 -- Allowed combining SearchVectors with different configs. --- tests/postgres_tests/test_search.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'tests/postgres_tests') diff --git a/tests/postgres_tests/test_search.py b/tests/postgres_tests/test_search.py index 068a4afe93..89aa8c6662 100644 --- a/tests/postgres_tests/test_search.py +++ b/tests/postgres_tests/test_search.py @@ -297,6 +297,17 @@ class TestCombinations(GrailTestData, PostgreSQLTestCase): with self.assertRaisesMessage(TypeError, msg): Line.objects.filter(dialogue__search=None + SearchVector('character__name')) + def test_combine_different_vector_configs(self): + searched = Line.objects.annotate( + search=( + SearchVector('dialogue', config='english') + + SearchVector('dialogue', config='french') + ), + ).filter( + search=SearchQuery('cadeaux', config='french') | SearchQuery('nostrils') + ) + self.assertCountEqual(searched, [self.french, self.verse2]) + def test_query_and(self): searched = Line.objects.annotate( search=SearchVector('scene__setting', 'dialogue'), -- cgit v1.3