From ee6cc20c7dbb3347b4c9303fd62996b392ac1c51 Mon Sep 17 00:00:00 2001 From: long2ice Date: Mon, 30 Nov 2020 11:14:09 +0800 Subject: [PATCH] Fix empty items --- aerich/cli.py | 5 +++-- aerich/utils.py | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/aerich/cli.py b/aerich/cli.py index f348072..d1fff3e 100644 --- a/aerich/cli.py +++ b/aerich/cli.py @@ -125,7 +125,7 @@ async def upgrade(ctx: Context): click.secho(f"Success upgrade {version_file}", fg=Color.green) migrated = True if not migrated: - click.secho("No items to be migrated", fg=Color.yellow) + click.secho("No upgrade items found", fg=Color.yellow) @cli.command(help="Downgrade to specified version.") @@ -170,7 +170,8 @@ async def downgrade(ctx: Context, version: int, delete: bool): content = get_version_content_from_file(file_path) downgrade_query_list = content.get("downgrade") if not downgrade_query_list: - return click.secho("No downgrade items found", fg=Color.yellow) + click.secho("No downgrade items found", fg=Color.yellow) + return for downgrade_query in downgrade_query_list: await conn.execute_query(downgrade_query) await version.delete() diff --git a/aerich/utils.py b/aerich/utils.py index b500ab9..20560c9 100644 --- a/aerich/utils.py +++ b/aerich/utils.py @@ -71,7 +71,10 @@ def get_version_content_from_file(version_file: str) -> Dict: second = len(content) - 1 upgrade_content = content[first + len(_UPGRADE) : second].strip() # noqa:E203 downgrade_content = content[second + len(_DOWNGRADE) :].strip() # noqa:E203 - ret = {"upgrade": upgrade_content.split(";\n"), "downgrade": downgrade_content.split(";\n")} + ret = { + "upgrade": list(filter(lambda x: x or False, upgrade_content.split(";\n"))), + "downgrade": list(filter(lambda x: x or False, downgrade_content.split(";\n"))), + } return ret