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

Fix python3 compatibility

Browse Source
This commit is contained in:
Marsel 2017-08-16 17:03:49 +03:00 committed by Itai Shirav
parent 06ed53e4ec
commit 70d34b097f
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,6 @@ class QuerySet(object):
"""
Iterates over the model instances matching this queryset
"""
print self.as_sql()
return self._database.select(self.as_sql(), self._model_cls)
def __bool__(self):
@ -211,7 +210,7 @@ class QuerySet(object):
assert s >= 0, 'negative indexes are not supported'
qs = copy(self)
qs._limits = (s, 1)
return iter(qs).next()
return next(iter(qs))
else:
# Slice
assert s.step in (None, 1), 'step is not supported in slices'

16
tests/test_querysets.py
View File

@ -140,7 +140,7 @@ class QuerySetTestCase(TestCaseWithData):
def test_slicing(self):
db = Database('system')
numbers = range(100)
numbers = list(range(100))
qs = Numbers.objects_in(db)
self.assertEquals(qs[0].number, numbers[0])
self.assertEquals(qs[5].number, numbers[5])
@ -211,7 +211,7 @@ class AggregateTestCase(TestCaseWithData):
def test_aggregate_no_grouping(self):
qs = Person.objects_in(self.database).aggregate(average_height='avg(height)', count='count()')
print qs.as_sql()
print(qs.as_sql())
self.assertEquals(qs.count(), 1)
for row in qs:
self.assertAlmostEqual(row.average_height, 1.6923, places=4)
@ -220,14 +220,14 @@ class AggregateTestCase(TestCaseWithData):
def test_aggregate_with_filter(self):
# When filter comes before aggregate
qs = Person.objects_in(self.database).filter(first_name='Warren').aggregate(average_height='avg(height)', count='count()')
print qs.as_sql()
print(qs.as_sql())
self.assertEquals(qs.count(), 1)
for row in qs:
self.assertAlmostEqual(row.average_height, 1.675, places=4)
self.assertEquals(row.count, 2)
# When filter comes after aggregate
qs = Person.objects_in(self.database).aggregate(average_height='avg(height)', count='count()').filter(first_name='Warren')
print qs.as_sql()
print(qs.as_sql())
self.assertEquals(qs.count(), 1)
for row in qs:
self.assertAlmostEqual(row.average_height, 1.675, places=4)
@ -235,7 +235,7 @@ class AggregateTestCase(TestCaseWithData):
def test_aggregate_with_implicit_grouping(self):
qs = Person.objects_in(self.database).aggregate('first_name', average_height='avg(height)', count='count()')
print qs.as_sql()
print(qs.as_sql())
self.assertEquals(qs.count(), 94)
total = 0
for row in qs:
@ -246,7 +246,7 @@ class AggregateTestCase(TestCaseWithData):
def test_aggregate_with_explicit_grouping(self):
qs = Person.objects_in(self.database).aggregate(weekday='toDayOfWeek(birthday)', count='count()').group_by('weekday')
print qs.as_sql()
print(qs.as_sql())
self.assertEquals(qs.count(), 7)
total = 0
for row in qs:
@ -256,7 +256,7 @@ class AggregateTestCase(TestCaseWithData):
def test_aggregate_with_order_by(self):
qs = Person.objects_in(self.database).aggregate(weekday='toDayOfWeek(birthday)', count='count()').group_by('weekday')
days = [row.weekday for row in qs.order_by('weekday')]
self.assertEquals(days, range(1, 8))
self.assertEquals(days, list(range(1, 8)))
def test_aggregate_with_indexing(self):
qs = Person.objects_in(self.database).aggregate(weekday='toDayOfWeek(birthday)', count='count()').group_by('weekday')
@ -326,4 +326,4 @@ class SampleModel(Model):
class Numbers(Model):
number = UInt64Field()
number = UInt64Field()