Merge pull request #13 from carrotquest/fix-infi-compatibility

Fixed import compatibility with new version on infi.clickhouse-orm
This commit is contained in:
M1ha Shvn 2020-06-03 11:42:53 +05:00 committed by GitHub
commit 030aab8ff3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View File

@ -13,7 +13,7 @@ with open('requirements.txt') as f:
setup( setup(
name='django-clickhouse', name='django-clickhouse',
version='1.0.0', version='1.0.1',
packages=['django_clickhouse'], packages=['django_clickhouse'],
package_dir={'': 'src'}, package_dir={'': 'src'},
url='https://github.com/carrotquest/django-clickhouse', url='https://github.com/carrotquest/django-clickhouse',

View File

@ -7,8 +7,13 @@ from typing import Optional, Set
from django.db import DEFAULT_DB_ALIAS as DJANGO_DEFAULT_DB_ALIAS from django.db import DEFAULT_DB_ALIAS as DJANGO_DEFAULT_DB_ALIAS
from django.db.models.signals import post_migrate from django.db.models.signals import post_migrate
from django.dispatch import receiver from django.dispatch import receiver
from infi.clickhouse_orm.database import ServerError, DatabaseException
# In order to support all operations import here
from infi.clickhouse_orm.migrations import * from infi.clickhouse_orm.migrations import *
from infi.clickhouse_orm.database import ServerError, DatabaseException
from infi.clickhouse_orm.fields import StringField, DateField
from infi.clickhouse_orm.engines import MergeTree
from infi.clickhouse_orm.utils import import_submodules from infi.clickhouse_orm.utils import import_submodules
from .clickhouse_models import ClickHouseModel from .clickhouse_models import ClickHouseModel