Infinidat/infi.clickhouse_orm
1
1
Fork 0
mirror of https://github.com/Infinidat/infi.clickhouse_orm.git synced 2025-08-03 19:50:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: correct boolean logic for Q objects

Browse Source 
Closes #4
This commit is contained in:
olliemath 2021-07-30 09:36:57 +01:00
parent ff580d73d8
commit 9b671d66d8
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clickhouse_orm/query.py
View File

@ -209,21 +209,18 @@ class Q(object):
Checks if there are any conditions in Q object Checks if there are any conditions in Q object
Returns: Boolean Returns: Boolean
""" """
return not bool(self._conds or self._children) return not (self._conds or self._children)
@classmethod @classmethod
def _construct_from(cls, l_child, r_child, mode): def _construct_from(cls, l_child, r_child, mode):
if mode == l_child._mode: if mode == l_child._mode and not l_child._negate:
q = deepcopy(l_child) q = deepcopy(l_child)
q._children.append(deepcopy(r_child)) q._children.append(deepcopy(r_child))
elif mode == r_child._mode:
q = deepcopy(r_child)
q._children.append(deepcopy(l_child))
else: else:
# Different modes
q = cls() q = cls()
q._children = [l_child, r_child] q._children = [l_child, r_child]
q._mode = mode # AND/OR q._mode = mode
return q return q

14
tests/test_querysets.py
View File

@ -6,7 +6,7 @@ from logging import getLogger
from clickhouse_orm.database import Database from clickhouse_orm.database import Database
from clickhouse_orm.engines import CollapsingMergeTree, Memory, MergeTree from clickhouse_orm.engines import CollapsingMergeTree, Memory, MergeTree
from clickhouse_orm.fields import DateField, DateTimeField, Enum8Field, Int8Field, Int32Field, UInt64Field from clickhouse_orm.fields import DateField, DateTimeField, Enum8Field, Int8Field, Int32Field, StringField, UInt64Field
from clickhouse_orm.funcs import F from clickhouse_orm.funcs import F
from clickhouse_orm.models import Model from clickhouse_orm.models import Model
from clickhouse_orm.query import Q from clickhouse_orm.query import Q
@ -568,10 +568,22 @@ class AggregateTestCase(TestCaseWithData):
limited_qs = qs.limit_by((6, 3), "height") limited_qs = qs.limit_by((6, 3), "height")
self.assertEqual([p.first_name for p in limited_qs[:3]], ["Norman", "Octavius", "Oliver"]) self.assertEqual([p.first_name for p in limited_qs[:3]], ["Norman", "Octavius", "Oliver"])
def test_boolean_logic(self):
p = ~Q(x="eggs")
q = Q(y="spam")
r = p & q
self.assertEqual(r.to_sql(StringyModel), "(NOT (x = 'eggs')) AND (y = 'spam')")
Color = Enum("Color", u"red blue green yellow brown white black") Color = Enum("Color", u"red blue green yellow brown white black")
class StringyModel(Model):
x = StringField()
y = StringField()
class SampleModel(Model): class SampleModel(Model):
timestamp = DateTimeField() timestamp = DateTimeField()