carrotquest/django-clickhouse
1
1
Fork 0
mirror of https://github.com/carrotquest/django-clickhouse.git synced 2024-11-22 00:56:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes in migration system to pass database directly

Browse Source
This commit is contained in:
M1ha 2018-11-26 11:56:50 +05:00
parent e1d7db1525
commit e8161ee7ce
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/django_clickhouse/migrations.py
View File

@ -2,6 +2,7 @@
Migrating database Migrating database
""" """
import datetime import datetime
from typing import Optional
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
@ -10,7 +11,7 @@ from infi.clickhouse_orm.migrations import *
from infi.clickhouse_orm.utils import import_submodules from infi.clickhouse_orm.utils import import_submodules
from .configuration import config from .configuration import config
from .database import connections from .database import connections, Database
from .utils import lazy_class_import, module_exists from .utils import lazy_class_import, module_exists
@ -20,10 +21,11 @@ class Migration:
""" """
operations = [] operations = []
def apply(self, db_alias): # type: (str) -> None def apply(self, db_alias, database=None): # type: (str, Optional[Database]) -> None
""" """
Applies migration to given database Applies migration to given database
:param db_alias: Database alias to apply migration to :param db_alias: Database alias to apply migration to
:param database: Sometimes I want to pass db object directly for testing purposes
:return: None :return: None
""" """
db_router = lazy_class_import(config.DATABASE_ROUTER)() db_router = lazy_class_import(config.DATABASE_ROUTER)()
@ -33,32 +35,33 @@ class Migration:
hints = getattr(op, 'hints', {}) hints = getattr(op, 'hints', {})
if db_router.allow_migrate(db_alias, self.__module__, model=model_class, **hints): if db_router.allow_migrate(db_alias, self.__module__, model=model_class, **hints):
op.apply(connections[db_alias]) database = database or connections[db_alias]
op.apply(database)
def migrate_app(app_label, db_alias, up_to=9999): def migrate_app(app_label, db_alias, up_to=9999, database=None):
# type: (str, str, int) -> None # type: (str, str, int, Optional[Database]) -> None
""" """
Migrates given django app Migrates given django app
:param app_label: App label to migrate :param app_label: App label to migrate
:param db_alias: Database alias to migrate :param db_alias: Database alias to migrate
:param up_to: Migration number to migrate to :param up_to: Migration number to migrate to
:param database: Sometimes I want to pass db object directly for testing purposes
:return: None :return: None
""" """
db = connections[db_alias]
migrations_package = "%s.%s" % (app_label, config.MIGRATIONS_PACKAGE) migrations_package = "%s.%s" % (app_label, config.MIGRATIONS_PACKAGE)
if module_exists(migrations_package): if module_exists(migrations_package):
applied_migrations = db._get_applied_migrations(migrations_package) applied_migrations = database._get_applied_migrations(migrations_package)
modules = import_submodules(migrations_package) modules = import_submodules(migrations_package)
unapplied_migrations = set(modules.keys()) - applied_migrations unapplied_migrations = set(modules.keys()) - applied_migrations
for name in sorted(unapplied_migrations): for name in sorted(unapplied_migrations):
migration = modules[name].Migration() migration = modules[name].Migration()
migration.apply(db_alias) migration.apply(db_alias, database=database)
db.insert([ database.insert([
MigrationHistory(package_name=migrations_package, module_name=name, applied=datetime.date.today()) MigrationHistory(package_name=migrations_package, module_name=name, applied=datetime.date.today())
]) ])