pub/aerich
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update regex

Browse Source
This commit is contained in:
long2ice 2020-05-19 17:16:21 +08:00
parent b07d1abf49
commit 55e78bdd2d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aerich/cli.py
View File

@ -3,7 +3,7 @@ import os
import sys import sys
from configparser import ConfigParser from configparser import ConfigParser
from enum import Enum from enum import Enum
from . import __version__
import asyncclick as click import asyncclick as click
from asyncclick import Context, UsageError from asyncclick import Context, UsageError
from tortoise import ConfigurationError, Tortoise, generate_schema_for_client 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.migrate import Migrate
from aerich.utils import get_app_connection, get_app_connection_name, get_tortoise_config from aerich.utils import get_app_connection, get_app_connection_name, get_tortoise_config
from . import __version__
class Color(str, Enum): class Color(str, Enum):
green = "green" green = "green"
@ -58,8 +60,8 @@ async def cli(ctx: Context, config, app, name):
if invoked_subcommand != "init-db": if invoked_subcommand != "init-db":
try: try:
await Migrate.init_with_old_models(tortoise_config, app, location) await Migrate.init_with_old_models(tortoise_config, app, location)
except ConfigurationError as e: except ConfigurationError:
raise UsageError(ctx=ctx, message=f"Tortoise ConfigurationError, {e}") raise UsageError(ctx=ctx, message="You must exec init-db first")
@cli.command(help="Generate migrate changes file.") @cli.command(help="Generate migrate changes file.")

4
aerich/migrate.py
View File

@ -146,11 +146,11 @@ class Migrate:
:param old_model_file: :param old_model_file:
:return: :return:
""" """
pattern = rf"\(('|\")({app})(.\w+)('|\")" pattern = rf"(\n)?('|\")({app})(.\w+)('|\")"
for i, model_file in enumerate(model_files): for i, model_file in enumerate(model_files):
with open(model_file, "r") as f: with open(model_file, "r") as f:
content = f.read() 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: with open(old_model_file, "w" if i == 0 else "w+a") as f:
f.write(ret) f.write(ret)