Infinidat/infi.clickhouse_orm
1
1
Fork 0
mirror of https://github.com/Infinidat/infi.clickhouse_orm.git synced 2024-11-22 00:56:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed invalid condtion joins in _filter_or_exclude (multiple_exclude_test)

Browse Source
This commit is contained in:
M1ha 2018-12-17 10:26:35 +05:00
parent 375316fbf3
commit d1e61dc420
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/infi/clickhouse_orm/query.py
View File

@ -411,9 +411,10 @@ class QuerySet(object):
def _filter_or_exclude(self, *q, **kwargs): def _filter_or_exclude(self, *q, **kwargs):
reverse = kwargs.pop('reverse', False) reverse = kwargs.pop('reverse', False)
prewhere = kwargs.pop('prewhere', False) prewhere = kwargs.pop('prewhere', False)
condition = copy(self._where_q)
qs = copy(self) qs = copy(self)
condition = Q()
for q_obj in q: for q_obj in q:
condition &= q_obj condition &= q_obj
@ -423,6 +424,7 @@ class QuerySet(object):
if reverse: if reverse:
condition = ~condition condition = ~condition
condition = copy(self._prewhere_q if prewhere else self._where_q) & condition
if prewhere: if prewhere:
qs._prewhere_q = condition qs._prewhere_q = condition
else: else: