diff options
| author | Jaap Roes <jaap.roes@gmail.com> | 2018-11-30 15:42:50 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-11-30 09:42:50 -0500 |
| commit | 8a1a9194686881e32d0e3aed52d7f4150238530c (patch) | |
| tree | 09d4719948e903b392b7be1704d941fc427e0c50 /django/contrib/postgres/search.py | |
| parent | 793a71b7be9970bee8cbac68985684628e99ad23 (diff) | |
| download | django-8a1a9194686881e32d0e3aed52d7f4150238530c.tar.gz | |
Fixed #29997 -- Allowed combining SearchQuerys with different configs.
Seems to be a needless restriction in
978a00e39fee25cfa99065285b0de88366710fad.
Diffstat (limited to 'django/contrib/postgres/search.py')
| -rw-r--r-- | django/contrib/postgres/search.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/django/contrib/postgres/search.py b/django/contrib/postgres/search.py index 635a715250..9cd79623b3 100644 --- a/django/contrib/postgres/search.py +++ b/django/contrib/postgres/search.py @@ -99,8 +99,6 @@ class SearchQueryCombinable: 'SearchQuery can only be combined with other SearchQuerys, ' 'got {}.'.format(type(other)) ) - if not self.config == other.config: - raise TypeError("SearchQuery configs don't match.") if reversed: return CombinedSearchQuery(other, connector, self, self.config) return CombinedSearchQuery(self, connector, other, self.config) |