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

- Nullable arrays not supported in latest ClickHouse version

Browse Source 
- system.parts table no longer includes "replicated" column in latest ClickHouse version
This commit is contained in:
Itai Shirav 2017-08-20 09:30:40 +03:00
parent 8f8f1d2176
commit 67e0442645
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,6 +1,11 @@
Change Log Change Log
========== ==========
Unreleased
----------
- Nullable arrays not supported in latest ClickHouse version
- system.parts table no longer includes "replicated" column in latest ClickHouse version
v0.9.5 v0.9.5
------ ------
- Added `QuerySet.paginate()` - Added `QuerySet.paginate()`

1
src/infi/clickhouse_orm/system_models.py
View File

@ -25,7 +25,6 @@ class SystemPart(Model):
engine = StringField() # Name of the table engine, without parameters. engine = StringField() # Name of the table engine, without parameters.
partition = StringField() # Name of the partition, in the format YYYYMM. partition = StringField() # Name of the partition, in the format YYYYMM.
name = StringField() # Name of the part. name = StringField() # Name of the part.
replicated = UInt8Field() # Whether the part belongs to replicated data.
# Whether the part is used in a table, or is no longer needed and will be deleted soon. # Whether the part is used in a table, or is no longer needed and will be deleted soon.
# Inactive parts remain after merging. # Inactive parts remain after merging.

22
tests/test_nullable_fields.py
View File

@ -75,18 +75,10 @@ class NullableFieldsTest(unittest.TestCase):
def _insert_sample_data(self): def _insert_sample_data(self):
dt = date(1970, 1, 1) dt = date(1970, 1, 1)
self.database.insert([ self.database.insert([
ModelWithNullable(date_field='2016-08-30', ModelWithNullable(date_field='2016-08-30', null_str='', null_int=42, null_date=dt),
null_str='', null_int=42, null_date=dt, ModelWithNullable(date_field='2016-08-30', null_str='nothing', null_int=None, null_date=None),
null_array=None), ModelWithNullable(date_field='2016-08-31', null_str=None, null_int=42, null_date=dt),
ModelWithNullable(date_field='2016-08-30', ModelWithNullable(date_field='2016-08-31', null_str=None, null_int=None, null_date=None)
null_str='nothing', null_int=None, null_date=None,
null_array=[1, 2, 3]),
ModelWithNullable(date_field='2016-08-31',
null_str=None, null_int=42, null_date=dt,
null_array=[]),
ModelWithNullable(date_field='2016-08-31',
null_str=None, null_int=None, null_date=None,
null_array=[3, 2, 1])
]) ])
def _assert_sample_data(self, results): def _assert_sample_data(self, results):
@ -105,11 +97,6 @@ class NullableFieldsTest(unittest.TestCase):
self.assertIsNone(results[3].null_str) self.assertIsNone(results[3].null_str)
self.assertIsNone(results[3].null_date) self.assertIsNone(results[3].null_date)
self.assertIsNone(results[0].null_array)
self.assertEquals(results[1].null_array, [1, 2, 3])
self.assertEquals(results[2].null_array, [])
self.assertEquals(results[3].null_array, [3, 2, 1])
def test_insert_and_select(self): def test_insert_and_select(self):
self._insert_sample_data() self._insert_sample_data()
query = 'SELECT * from $table ORDER BY date_field' query = 'SELECT * from $table ORDER BY date_field'
@ -129,6 +116,5 @@ class ModelWithNullable(Model):
null_str = NullableField(StringField(), extra_null_values={''}) null_str = NullableField(StringField(), extra_null_values={''})
null_int = NullableField(Int32Field()) null_int = NullableField(Int32Field())
null_date = NullableField(DateField()) null_date = NullableField(DateField())
null_array = NullableField(ArrayField(Int32Field()))
engine = MergeTree('date_field', ('date_field',)) engine = MergeTree('date_field', ('date_field',))