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

Apply black

Browse Source
This commit is contained in:
Adam Ciarciński 2020-07-08 14:38:42 +02:00
parent 3c111792a9
commit 90196eb1bf
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aerich/ddl/postgres/__init__.py
View File

@ -18,7 +18,7 @@ class PostgresDDL(BaseDDL):
return self._ALTER_DEFAULT_TEMPLATE.format( return self._ALTER_DEFAULT_TEMPLATE.format(
table_name=db_table, table_name=db_table,
column=field_object.model_field_name, column=field_object.model_field_name,
default="SET" + default if default else "DROP DEFAULT" default="SET" + default if default else "DROP DEFAULT",
) )
def alter_column_null(self, model: "Type[Model]", field_object: Field): def alter_column_null(self, model: "Type[Model]", field_object: Field):
@ -26,7 +26,7 @@ class PostgresDDL(BaseDDL):
return self._ALTER_NULL_TEMPLATE.format( return self._ALTER_NULL_TEMPLATE.format(
table_name=db_table, table_name=db_table,
column=field_object.model_field_name, column=field_object.model_field_name,
set_drop="DROP" if field_object.null else "SET" set_drop="DROP" if field_object.null else "SET",
) )
def modify_column(self, model: "Type[Model]", field_object: Field): def modify_column(self, model: "Type[Model]", field_object: Field):
@ -34,7 +34,7 @@ class PostgresDDL(BaseDDL):
return self._MODIFY_COLUMN_TEMPLATE.format( return self._MODIFY_COLUMN_TEMPLATE.format(
table_name=db_table, table_name=db_table,
column=field_object.model_field_name, column=field_object.model_field_name,
datatype=field_object.get_for_dialect(self.DIALECT, "SQL_TYPE") datatype=field_object.get_for_dialect(self.DIALECT, "SQL_TYPE"),
) )
def set_comment(self, model: "Type[Model]", field_object: Field): def set_comment(self, model: "Type[Model]", field_object: Field):
@ -42,5 +42,5 @@ class PostgresDDL(BaseDDL):
return self._SET_COMMENT_TEMPLATE.format( return self._SET_COMMENT_TEMPLATE.format(
table_name=db_table, table_name=db_table,
column=field_object.model_field_name, column=field_object.model_field_name,
comment="'{}'".format(field_object.description) if field_object.description else 'NULL' comment="'{}'".format(field_object.description) if field_object.description else "NULL",
) )

12
aerich/migrate.py
View File

@ -276,11 +276,17 @@ class Migrate:
if not cls._is_fk_m2m(new_field) and new_field_dict != old_field_dict: if not cls._is_fk_m2m(new_field) and new_field_dict != old_field_dict:
if cls.dialect == "postgres": if cls.dialect == "postgres":
if new_field.null != old_field.null: if new_field.null != old_field.null:
cls._add_operator(cls._alter_null(new_model, new_field), upgrade=upgrade) cls._add_operator(
cls._alter_null(new_model, new_field), upgrade=upgrade
)
if new_field.default != old_field.default: if new_field.default != old_field.default:
cls._add_operator(cls._alter_default(new_model, new_field), upgrade=upgrade) cls._add_operator(
cls._alter_default(new_model, new_field), upgrade=upgrade
)
if new_field.description != old_field.description: if new_field.description != old_field.description:
cls._add_operator(cls._set_comment(new_model, new_field), upgrade=upgrade) cls._add_operator(
cls._set_comment(new_model, new_field), upgrade=upgrade
)
cls._add_operator(cls._modify_field(new_model, new_field), upgrade=upgrade) cls._add_operator(cls._modify_field(new_model, new_field), upgrade=upgrade)
if (old_field.index and not new_field.index) or ( if (old_field.index and not new_field.index) or (
old_field.unique and not new_field.unique old_field.unique and not new_field.unique

9
tests/test_ddl.py
View File

@ -77,7 +77,10 @@ def test_modify_column():
elif isinstance(Migrate.ddl, PostgresDDL): elif isinstance(Migrate.ddl, PostgresDDL):
assert ret == 'ALTER TABLE "user" ALTER COLUMN "is_active" TYPE BOOL' assert ret == 'ALTER TABLE "user" ALTER COLUMN "is_active" TYPE BOOL'
else: else:
assert ret == 'ALTER TABLE "user" MODIFY COLUMN "is_active" INT NOT NULL DEFAULT 1 /* Is Active */' assert (
ret
== 'ALTER TABLE "user" MODIFY COLUMN "is_active" INT NOT NULL DEFAULT 1 /* Is Active */'
)
def test_alter_column_default(): def test_alter_column_default():
@ -89,7 +92,9 @@ def test_alter_column_default():
ret = Migrate.ddl.alter_column_default(Category, Category._meta.fields_map.get("created_at")) ret = Migrate.ddl.alter_column_default(Category, Category._meta.fields_map.get("created_at"))
if isinstance(Migrate.ddl, PostgresDDL): if isinstance(Migrate.ddl, PostgresDDL):
assert ret == 'ALTER TABLE "category" ALTER COLUMN "created_at" SET DEFAULT CURRENT_TIMESTAMP' assert (
ret == 'ALTER TABLE "category" ALTER COLUMN "created_at" SET DEFAULT CURRENT_TIMESTAMP'
)
else: else:
assert ret == None assert ret == None