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

Activate type hint check in ci

Browse Source
This commit is contained in:
Waket Zheng 2024-06-06 17:07:09 +08:00
parent 13dd44bef7
commit ceb1e0ffef
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -22,6 +22,8 @@ style: deps _style
_check: _check:
@black --check $(black_opts) $(checkfiles) || (echo "Please run 'make style' to auto-fix style issues" && false) @black --check $(black_opts) $(checkfiles) || (echo "Please run 'make style' to auto-fix style issues" && false)
@ruff check $(checkfiles) @ruff check $(checkfiles)
@mypy $(checkfiles)
@bandit -r aerich
check: deps _check check: deps _check
test: deps test: deps

2
aerich/ddl/__init__.py
View File

@ -135,7 +135,7 @@ class BaseDDL:
self.schema_generator._column_comment_generator( self.schema_generator._column_comment_generator(
table=db_table, table=db_table,
column=db_column, column=db_column,
comment=field_describe.get("description"), comment=description,
) )
if description if description
else "" else ""

2
aerich/inspectdb/postgres.py
View File

@ -56,7 +56,7 @@ from information_schema.constraint_column_usage const
right join information_schema.columns c using (column_name, table_catalog, table_schema, table_name) right join information_schema.columns c using (column_name, table_catalog, table_schema, table_name)
where c.table_catalog = $1 where c.table_catalog = $1
and c.table_name = $2 and c.table_name = $2
and c.table_schema = $3""" and c.table_schema = $3""" # nosec:B608
ret = await self.conn.execute_query_dict(sql, [self.database, table, self.schema]) ret = await self.conn.execute_query_dict(sql, [self.database, table, self.schema])
for row in ret: for row in ret:
columns.append( columns.append(

12
tests/test_migrate.py
View File

@ -1,4 +1,5 @@
from pathlib import Path from pathlib import Path
from typing import List, cast
import pytest import pytest
import tortoise import tortoise
@ -792,13 +793,13 @@ old_models_describe = {
def should_add_user_id_column_type_alter_sql() -> bool: def should_add_user_id_column_type_alter_sql() -> bool:
if tortoise.__version__ < "0.21":
return False
# tortoise-orm>=0.21 changes IntField constraints # tortoise-orm>=0.21 changes IntField constraints
# from {"ge": 1, "le": 2147483647} to {"ge": -2147483648,"le": 2147483647} # from {"ge": 1, "le": 2147483647} to {"ge": -2147483648,"le": 2147483647}
user_id_constraints = old_models_describe["models.Category"]["data_fields"][-1]["constraints"] data_fields = cast(List[dict], old_models_describe["models.Category"]["data_fields"])
return ( user_id_constraints = data_fields[-1]["constraints"]
tortoise.__version__ >= "0.21" return tortoise.fields.data.IntField.constraints != user_id_constraints
and tortoise.fields.data.IntField.constraints != user_id_constraints
)
def test_migrate(mocker: MockerFixture): def test_migrate(mocker: MockerFixture):
@ -825,6 +826,7 @@ def test_migrate(mocker: MockerFixture):
if isinstance(Migrate.ddl, SqliteDDL): if isinstance(Migrate.ddl, SqliteDDL):
with pytest.raises(NotSupportError): with pytest.raises(NotSupportError):
Migrate.diff_models(old_models_describe, models_describe) Migrate.diff_models(old_models_describe, models_describe)
with pytest.raises(NotSupportError):
Migrate.diff_models(models_describe, old_models_describe, False) Migrate.diff_models(models_describe, old_models_describe, False)
else: else:
Migrate.diff_models(old_models_describe, models_describe) Migrate.diff_models(old_models_describe, models_describe)