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

Fix fo conditions_as_sql method by review

Browse Source
This commit is contained in:
M1ha 2018-12-19 10:06:57 +05:00
parent d1e61dc420
commit 6902de3b94
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,10 +345,10 @@ class QuerySet(object):
sql = u'SELECT %s%s\nFROM `%s`%s' % params
if self._prewhere_q:
sql += '\nPREWHERE ' + self.conditions_as_sql(self._prewhere_q)
sql += '\nPREWHERE ' + self.conditions_as_sql(prewhere=True)
if self._where_q:
sql += '\nWHERE ' + self.conditions_as_sql(self._where_q)
sql += '\nWHERE ' + self.conditions_as_sql(prewhere=False)
if self._grouping_fields:
sql += '\nGROUP BY %s' % comma_join('`%s`' % field for field in self._grouping_fields)
@ -370,10 +370,11 @@ class QuerySet(object):
for field in self._order_by
])
def conditions_as_sql(self, q_object):
def conditions_as_sql(self, prewhere=False):
"""
Returns the contents of the query's `WHERE` or `PREWHERE` clause as a string.
"""
q_object = self._prewhere_q if prewhere else self._where_q
return q_object.to_sql(self._model_cls)
def count(self):
@ -387,7 +388,7 @@ class QuerySet(object):
return int(raw) if raw else 0
# Simple case
conditions = self.conditions_as_sql(self._where_q & self._prewhere_q)
conditions = (self._where_q & self._prewhere_q).to_sql(self._model_cls)
return self._database.count(self._model_cls, conditions)
def order_by(self, *field_names):

8
tests/test_querysets.py
View File

@ -417,13 +417,13 @@ class AggregateTestCase(TestCaseWithData):
the__next__number = Int32Field()
engine = Memory()
qs = Mdl.objects_in(self.database).filter(the__number=1)
self.assertEqual(qs.conditions_as_sql(qs._where_q), 'the__number = 1')
self.assertEqual(qs.conditions_as_sql(), 'the__number = 1')
qs = Mdl.objects_in(self.database).filter(the__number__gt=1)
self.assertEqual(qs.conditions_as_sql(qs._where_q), 'the__number > 1')
self.assertEqual(qs.conditions_as_sql(), 'the__number > 1')
qs = Mdl.objects_in(self.database).filter(the__next__number=1)
self.assertEqual(qs.conditions_as_sql(qs._where_q), 'the__next__number = 1')
self.assertEqual(qs.conditions_as_sql(), 'the__next__number = 1')
qs = Mdl.objects_in(self.database).filter(the__next__number__gt=1)
self.assertEqual(qs.conditions_as_sql(qs._where_q), 'the__next__number > 1')
self.assertEqual(qs.conditions_as_sql(), 'the__next__number > 1')
Color = Enum('Color', u'red blue green yellow brown white black')