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

Fix tests that fail on older ClickHouse versions

Browse Source
This commit is contained in:
Itai Shirav 2020-05-29 01:59:07 +03:00
parent efebfc67ed
commit 3fb3936a8a
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/infi/clickhouse_orm/funcs.py
View File

@ -294,6 +294,8 @@ class F(Cond, FunctionOperatorsMixin, metaclass=FMeta):
return 'NULL' return 'NULL'
if isinstance(arg, QuerySet): if isinstance(arg, QuerySet):
return "(%s)" % arg return "(%s)" % arg
if isinstance(arg, tuple):
return '(' + comma_join(F._arg_to_sql(x) for x in arg) + ')'
if is_iterable(arg): if is_iterable(arg):
return '[' + comma_join(F._arg_to_sql(x) for x in arg) + ']' return '[' + comma_join(F._arg_to_sql(x) for x in arg) + ']'
return str(arg) return str(arg)
@ -406,11 +408,15 @@ class F(Cond, FunctionOperatorsMixin, metaclass=FMeta):
@staticmethod @staticmethod
@binary_operator @binary_operator
def _in(a, b): def _in(a, b):
if is_iterable(b) and not isinstance(b, (tuple, QuerySet)):
b = tuple(b)
return F('IN', a, b) return F('IN', a, b)
@staticmethod @staticmethod
@binary_operator @binary_operator
def _notIn(a, b): def _notIn(a, b):
if is_iterable(b) and not isinstance(b, (tuple, QuerySet)):
b = tuple(b)
return F('NOT IN', a, b) return F('NOT IN', a, b)
# Functions for working with dates and times # Functions for working with dates and times

2
tests/test_database.py
View File

@ -33,6 +33,8 @@ class DatabaseTestCase(TestCaseWithData):
self._insert_and_check(self._sample_data(), len(data), batch_size=100) self._insert_and_check(self._sample_data(), len(data), batch_size=100)
def test_insert__funcs_as_default_values(self): def test_insert__funcs_as_default_values(self):
if self.database.server_version < (20, 1, 2, 4):
raise unittest.SkipTest('Buggy in server versions before 20.1.2.4')
class TestModel(Model): class TestModel(Model):
a = DateTimeField(default=datetime.datetime(2020, 1, 1)) a = DateTimeField(default=datetime.datetime(2020, 1, 1))
b = DateField(default=F.toDate(a)) b = DateField(default=F.toDate(a))

12
tests/test_funcs.py
View File

@ -75,9 +75,11 @@ class FuncsTestCase(TestCaseWithData):
self.assertEqual(F('func', F('sqrt', 25)).to_sql(), 'func(sqrt(25))') self.assertEqual(F('func', F('sqrt', 25)).to_sql(), 'func(sqrt(25))')
# Iterables as args # Iterables as args
x = [1, 'z', F('foo', 17)] x = [1, 'z', F('foo', 17)]
for y in [x, tuple(x), iter(x)]: for y in [x, iter(x)]:
self.assertEqual(F('func', y, 5).to_sql(), "func([1, 'z', foo(17)], 5)") self.assertEqual(F('func', y, 5).to_sql(), "func([1, 'z', foo(17)], 5)")
self.assertEqual(F('func', [(1, 2), (3, 4)]).to_sql(), "func([[1, 2], [3, 4]])") # Tuples as args
self.assertEqual(F('func', [(1, 2), (3, 4)]).to_sql(), "func([(1, 2), (3, 4)])")
self.assertEqual(F('func', tuple(x), 5).to_sql(), "func((1, 'z', foo(17)), 5)")
# Binary operator functions # Binary operator functions
self.assertEqual(F.plus(1, 2).to_sql(), "(1 + 2)") self.assertEqual(F.plus(1, 2).to_sql(), "(1 + 2)")
self.assertEqual(F.lessOrEquals(1, 2).to_sql(), "(1 <= 2)") self.assertEqual(F.lessOrEquals(1, 2).to_sql(), "(1 <= 2)")
@ -187,9 +189,9 @@ class FuncsTestCase(TestCaseWithData):
self._test_func(one | 0, 1) self._test_func(one | 0, 1)
self._test_func(0 | one, 1) self._test_func(0 | one, 1)
# ^ # ^
self._test_func(one ^ one, 0) self._test_func(one ^ one)
self._test_func(one ^ 0, 1) self._test_func(one ^ 0)
self._test_func(0 ^ one, 1) self._test_func(0 ^ one)
# ~ # ~
self._test_func(~one, 0) self._test_func(~one, 0)
self._test_func(~~one, 1) self._test_func(~~one, 1)