From 55e78bdd2da68819d4e2a61bad5468c8773222e1 Mon Sep 17 00:00:00 2001 From: long2ice Date: Tue, 19 May 2020 17:16:21 +0800 Subject: [PATCH] update regex --- aerich/cli.py | 8 +++++--- aerich/migrate.py | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/aerich/cli.py b/aerich/cli.py index 7cd1a00..8933885 100644 --- a/aerich/cli.py +++ b/aerich/cli.py @@ -3,7 +3,7 @@ import os import sys from configparser import ConfigParser from enum import Enum -from . import __version__ + import asyncclick as click from asyncclick import Context, UsageError from tortoise import ConfigurationError, Tortoise, generate_schema_for_client @@ -12,6 +12,8 @@ from tortoise.transactions import in_transaction from aerich.migrate import Migrate from aerich.utils import get_app_connection, get_app_connection_name, get_tortoise_config +from . import __version__ + class Color(str, Enum): green = "green" @@ -58,8 +60,8 @@ async def cli(ctx: Context, config, app, name): if invoked_subcommand != "init-db": try: await Migrate.init_with_old_models(tortoise_config, app, location) - except ConfigurationError as e: - raise UsageError(ctx=ctx, message=f"Tortoise ConfigurationError, {e}") + except ConfigurationError: + raise UsageError(ctx=ctx, message="You must exec init-db first") @cli.command(help="Generate migrate changes file.") diff --git a/aerich/migrate.py b/aerich/migrate.py index e54f927..9e8e111 100644 --- a/aerich/migrate.py +++ b/aerich/migrate.py @@ -146,11 +146,11 @@ class Migrate: :param old_model_file: :return: """ - pattern = rf"\(('|\")({app})(.\w+)('|\")" + pattern = rf"(\n)?('|\")({app})(.\w+)('|\")" for i, model_file in enumerate(model_files): with open(model_file, "r") as f: content = f.read() - ret = re.sub(pattern, rf"(\1{cls.diff_app}\3\4", content) + ret = re.sub(pattern, rf"\2{cls.diff_app}\4\5", content) with open(old_model_file, "w" if i == 0 else "w+a") as f: f.write(ret)