diff --git a/CHANGELOG.md b/CHANGELOG.md index 56329e4..da8d3c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 0.7 +### 0.7.3 + +- Added `-i` and `--in-transaction` options to `aerich migrate` command. (#296) + ### 0.7.2 - Support virtual fields. diff --git a/aerich/__init__.py b/aerich/__init__.py index 75f4e05..2109b94 100644 --- a/aerich/__init__.py +++ b/aerich/__init__.py @@ -36,7 +36,18 @@ def __init__( async def init(self): await Migrate.init(self.tortoise_config, self.app, self.location) - async def upgrade(self): + async def _upgrade(self, conn, version_file): + file_path = Path(Migrate.migrate_location, version_file) + m = import_py_file(file_path) + upgrade = getattr(m, "upgrade") + await conn.execute_script(await upgrade(conn)) + await Aerich.create( + version=version_file, + app=self.app, + content=get_models_describe(self.app), + ) + + async def upgrade(self, run_in_transaction: bool): migrated = [] for version_file in Migrate.get_all_version_files(): try: @@ -44,18 +55,13 @@ async def upgrade(self): except OperationalError: exists = False if not exists: - async with in_transaction( - get_app_connection_name(self.tortoise_config, self.app) - ) as conn: - file_path = Path(Migrate.migrate_location, version_file) - m = import_py_file(file_path) - upgrade = getattr(m, "upgrade") - await conn.execute_script(await upgrade(conn)) - await Aerich.create( - version=version_file, - app=self.app, - content=get_models_describe(self.app), - ) + app_conn_name = get_app_connection_name(self.tortoise_config, self.app) + if run_in_transaction: + async with in_transaction(app_conn_name) as conn: + await self._upgrade(conn, version_file) + else: + app_conn = get_app_connection(self.tortoise_config, self.app) + await self._upgrade(app_conn, version_file) migrated.append(version_file) return migrated diff --git a/aerich/cli.py b/aerich/cli.py index 072e547..3d1f08b 100644 --- a/aerich/cli.py +++ b/aerich/cli.py @@ -90,11 +90,18 @@ async def migrate(ctx: Context, name): @cli.command(help="Upgrade to specified version.") +@click.option( + "--in-transaction", + "-i", + default=True, + type=bool, + help="Make migrations in transaction or not. Can be helpful for large migrations or creating concurrent indexes.", +) @click.pass_context @coro -async def upgrade(ctx: Context): +async def upgrade(ctx: Context, in_transaction: bool): command = ctx.obj["command"] - migrated = await command.upgrade() + migrated = await command.upgrade(run_in_transaction=in_transaction) if not migrated: click.secho("No upgrade items found", fg=Color.yellow) else: diff --git a/pyproject.toml b/pyproject.toml index 0be84af..2f37019 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "aerich" -version = "0.7.2" +version = "0.7.3" description = "A database migrations tool for Tortoise ORM." authors = ["long2ice "] license = "Apache-2.0"