diff --git a/src/clickhouse_orm/fields.py b/src/clickhouse_orm/fields.py index 964345a..6dd342d 100644 --- a/src/clickhouse_orm/fields.py +++ b/src/clickhouse_orm/fields.py @@ -254,7 +254,7 @@ class DateTime64Field(DateTimeField): def __init__(self, default=None, alias=None, materialized=None, readonly=None, codec=None, db_column=None, timezone=None, precision=6): - super().__init__(default, alias, materialized, readonly, codec, timezone, db_column) + super().__init__(default, alias, materialized, readonly, codec, db_column, timezone) assert precision is None or isinstance(precision, int), 'Precision must be int type' self.precision = precision diff --git a/src/clickhouse_orm/models.py b/src/clickhouse_orm/models.py index b6eeab9..491a83e 100644 --- a/src/clickhouse_orm/models.py +++ b/src/clickhouse_orm/models.py @@ -251,7 +251,8 @@ class ModelBase(type): name = db_type + 'Field' if not (hasattr(orm_fields, name) or hasattr(geo_fields, name)): raise NotImplementedError('No field class for %s' % db_type) - return getattr(orm_fields, name, getattr(geo_fields, name))() + field_class = getattr(orm_fields, name, None) or getattr(geo_fields, name, None) + return field_class() class Model(metaclass=ModelBase): diff --git a/tests/sample_migrations/0001_initial.py b/tests/sample_migrations/0001_initial.py index a289d86..19c2882 100644 --- a/tests/sample_migrations/0001_initial.py +++ b/tests/sample_migrations/0001_initial.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0002.py b/tests/sample_migrations/0002.py index 6e4e0d9..bdd10cf 100644 --- a/tests/sample_migrations/0002.py +++ b/tests/sample_migrations/0002.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0003.py b/tests/sample_migrations/0003.py index a289d86..19c2882 100644 --- a/tests/sample_migrations/0003.py +++ b/tests/sample_migrations/0003.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0004.py b/tests/sample_migrations/0004.py index 6d10205..38e7e44 100644 --- a/tests/sample_migrations/0004.py +++ b/tests/sample_migrations/0004.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0005.py b/tests/sample_migrations/0005.py index f2633ef..da37168 100644 --- a/tests/sample_migrations/0005.py +++ b/tests/sample_migrations/0005.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0006.py b/tests/sample_migrations/0006.py index fefb325..343906d 100644 --- a/tests/sample_migrations/0006.py +++ b/tests/sample_migrations/0006.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0007.py b/tests/sample_migrations/0007.py index da23040..c968a17 100644 --- a/tests/sample_migrations/0007.py +++ b/tests/sample_migrations/0007.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0008.py b/tests/sample_migrations/0008.py index 691a762..c799e3f 100644 --- a/tests/sample_migrations/0008.py +++ b/tests/sample_migrations/0008.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0009.py b/tests/sample_migrations/0009.py index 7841f17..bd0c4f0 100644 --- a/tests/sample_migrations/0009.py +++ b/tests/sample_migrations/0009.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0010.py b/tests/sample_migrations/0010.py index 3892583..c01c00a 100644 --- a/tests/sample_migrations/0010.py +++ b/tests/sample_migrations/0010.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0011.py b/tests/sample_migrations/0011.py index dd9d09e..0d88556 100644 --- a/tests/sample_migrations/0011.py +++ b/tests/sample_migrations/0011.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0012.py b/tests/sample_migrations/0012.py index 1dfe3bf..0120a5c 100644 --- a/tests/sample_migrations/0012.py +++ b/tests/sample_migrations/0012.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations operations = [ migrations.RunSQL("INSERT INTO `mig` (date, f1, f3, f4) VALUES ('2016-01-01', 1, 1, 'test') "), diff --git a/tests/sample_migrations/0013.py b/tests/sample_migrations/0013.py index 5ee6498..3dc2f7a 100644 --- a/tests/sample_migrations/0013.py +++ b/tests/sample_migrations/0013.py @@ -1,6 +1,6 @@ import datetime -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from test_migrations import Model3 diff --git a/tests/sample_migrations/0014.py b/tests/sample_migrations/0014.py index 14553f3..7cbcc32 100644 --- a/tests/sample_migrations/0014.py +++ b/tests/sample_migrations/0014.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0015.py b/tests/sample_migrations/0015.py index be1d378..de75d76 100644 --- a/tests/sample_migrations/0015.py +++ b/tests/sample_migrations/0015.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0016.py b/tests/sample_migrations/0016.py index 6f0f814..21387d1 100644 --- a/tests/sample_migrations/0016.py +++ b/tests/sample_migrations/0016.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0017.py b/tests/sample_migrations/0017.py index 4151189..1a1089c 100644 --- a/tests/sample_migrations/0017.py +++ b/tests/sample_migrations/0017.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0018.py b/tests/sample_migrations/0018.py index c34c137..97f52a5 100644 --- a/tests/sample_migrations/0018.py +++ b/tests/sample_migrations/0018.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0019.py b/tests/sample_migrations/0019.py index 67ba244..ede957f 100644 --- a/tests/sample_migrations/0019.py +++ b/tests/sample_migrations/0019.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [