Skip to content

Commit d2e0a68

Browse files
committed
Fix packaging error. (#92)
1 parent ee6cc20 commit d2e0a68

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
- Use `pathlib` for path resolving. (#89)
88
- Fix upgrade in new db. (#96)
9+
- Fix packaging error. (#92)
910

1011
### 0.4.1
1112

aerich/migrate.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
from importlib import import_module
66
from io import StringIO
77
from pathlib import Path
8-
from typing import Dict, List, Optional, Tuple, Type, Union
8+
from typing import Dict, List, Optional, Tuple, Type
99

1010
import click
11-
from packaging import version
12-
from packaging.version import LegacyVersion, Version
1311
from tortoise import (
1412
BackwardFKRelation,
1513
BackwardOneToOneRelation,
@@ -45,7 +43,7 @@ class Migrate:
4543
app: str
4644
migrate_location: str
4745
dialect: str
48-
_db_version: Union[LegacyVersion, Version] = None
46+
_db_version: Optional[str] = None
4947

5048
@classmethod
5149
def get_old_model_file(cls, app: str, location: str):
@@ -77,7 +75,7 @@ async def _get_db_version(cls, connection: BaseDBAsyncClient):
7775
if cls.dialect == "mysql":
7876
sql = "select version() as version"
7977
ret = await connection.execute_query(sql)
80-
cls._db_version = version.parse(ret[1][0].get("version"))
78+
cls._db_version = ret[1][0].get("version")
8179

8280
@classmethod
8381
async def init_with_old_models(cls, config: dict, app: str, location: str):
@@ -315,7 +313,7 @@ def diff_model(cls, old_model: Type[Model], new_model: Type[Model], upgrade=True
315313
if (
316314
cls.dialect == "mysql"
317315
and cls._db_version
318-
and cls._db_version.major == 5
316+
and cls._db_version.startswith("5.")
319317
):
320318
cls._add_operator(
321319
cls._change_field(new_model, old_field, new_field),

aerich/utils.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,20 @@
55
from tortoise import BaseDBAsyncClient, Tortoise
66

77

8-
def get_app_connection_name(config, app) -> str:
8+
def get_app_connection_name(config, app_name: str) -> str:
99
"""
1010
get connection name
1111
:param config:
12-
:param app:
12+
:param app_name:
1313
:return:
1414
"""
15-
return config.get("apps").get(app).get("default_connection", "default")
15+
app = config.get("apps").get(app_name)
16+
if app:
17+
return app.get("default_connection", "default")
18+
raise BadOptionUsage(
19+
option_name="--app",
20+
message=f'Can\'t get app named "{app_name}"',
21+
)
1622

1723

1824
def get_app_connection(config, app) -> BaseDBAsyncClient:

0 commit comments

Comments
 (0)