diff --git a/aerich/ddl/__init__.py b/aerich/ddl/__init__.py index 422287e..d8a1595 100644 --- a/aerich/ddl/__init__.py +++ b/aerich/ddl/__init__.py @@ -23,7 +23,12 @@ class BaseDDL: _DROP_INDEX_TEMPLATE = 'ALTER TABLE "{table_name}" DROP INDEX "{index_name}"' _ADD_FK_TEMPLATE = 'ALTER TABLE "{table_name}" ADD CONSTRAINT "{fk_name}" FOREIGN KEY ("{db_column}") REFERENCES "{table}" ("{field}") ON DELETE {on_delete}' _DROP_FK_TEMPLATE = 'ALTER TABLE "{table_name}" DROP FOREIGN KEY "{fk_name}"' - _M2M_TABLE_TEMPLATE = 'CREATE TABLE "{table_name}" ("{backward_key}" {backward_type} NOT NULL REFERENCES "{backward_table}" ("{backward_field}") ON DELETE CASCADE,"{forward_key}" {forward_type} NOT NULL REFERENCES "{forward_table}" ("{forward_field}") ON DELETE {on_delete}){extra}{comment}' + _M2M_TABLE_TEMPLATE = ( + 'CREATE TABLE "{table_name}" (\n' + ' "{backward_key}" {backward_type} NOT NULL REFERENCES "{backward_table}" ("{backward_field}") ON DELETE CASCADE,\n' + ' "{forward_key}" {forward_type} NOT NULL REFERENCES "{forward_table}" ("{forward_field}") ON DELETE {on_delete}\n' + "){extra}{comment}" + ) _MODIFY_COLUMN_TEMPLATE = 'ALTER TABLE "{table_name}" MODIFY COLUMN {column}' _CHANGE_COLUMN_TEMPLATE = ( 'ALTER TABLE "{table_name}" CHANGE {old_column_name} {new_column_name} {new_column_type}' diff --git a/aerich/ddl/mysql/__init__.py b/aerich/ddl/mysql/__init__.py index 0cce776..2eea288 100644 --- a/aerich/ddl/mysql/__init__.py +++ b/aerich/ddl/mysql/__init__.py @@ -22,6 +22,11 @@ class MysqlDDL(BaseDDL): _DROP_INDEX_TEMPLATE = "ALTER TABLE `{table_name}` DROP INDEX `{index_name}`" _ADD_FK_TEMPLATE = "ALTER TABLE `{table_name}` ADD CONSTRAINT `{fk_name}` FOREIGN KEY (`{db_column}`) REFERENCES `{table}` (`{field}`) ON DELETE {on_delete}" _DROP_FK_TEMPLATE = "ALTER TABLE `{table_name}` DROP FOREIGN KEY `{fk_name}`" - _M2M_TABLE_TEMPLATE = "CREATE TABLE `{table_name}` (`{backward_key}` {backward_type} NOT NULL REFERENCES `{backward_table}` (`{backward_field}`) ON DELETE CASCADE,`{forward_key}` {forward_type} NOT NULL REFERENCES `{forward_table}` (`{forward_field}`) ON DELETE CASCADE){extra}{comment}" + _M2M_TABLE_TEMPLATE = ( + "CREATE TABLE `{table_name}` (\n" + " `{backward_key}` {backward_type} NOT NULL REFERENCES `{backward_table}` (`{backward_field}`) ON DELETE CASCADE,\n" + " `{forward_key}` {forward_type} NOT NULL REFERENCES `{forward_table}` (`{forward_field}`) ON DELETE CASCADE\n" + "){extra}{comment}" + ) _MODIFY_COLUMN_TEMPLATE = "ALTER TABLE `{table_name}` MODIFY COLUMN {column}" _RENAME_TABLE_TEMPLATE = "ALTER TABLE `{old_table_name}` RENAME TO `{new_table_name}`" diff --git a/aerich/utils.py b/aerich/utils.py index b51264b..ec4d9cd 100644 --- a/aerich/utils.py +++ b/aerich/utils.py @@ -96,8 +96,8 @@ def get_version_content_from_file(version_file: Union[str, Path]) -> Dict: upgrade_content = content[first + len(_UPGRADE) : second].strip() # noqa:E203 downgrade_content = content[second + len(_DOWNGRADE) :].strip() # noqa:E203 ret = { - "upgrade": list(filter(lambda x: x or False, upgrade_content.split(";\n"))), - "downgrade": list(filter(lambda x: x or False, downgrade_content.split(";\n"))), + "upgrade": [line for line in upgrade_content.split(";\n") if line], + "downgrade": [line for line in downgrade_content.split(";\n") if line], } return ret @@ -109,25 +109,22 @@ def write_version_file(version_file: Path, content: Dict): :param content: :return: """ - text = _UPGRADE - upgrade = content.get("upgrade") - if len(upgrade) > 1: - text += ";\n".join(upgrade) - if not upgrade[-1].endswith(";"): - text += ";\n" - else: - text += f"{upgrade[0]}" - if not upgrade[0].endswith(";"): - text += ";" - text += "\n" + + def append_ddl(ddl: str): + if not ddl.endswith(";"): + ddl += ";" + ddl += "\n" + data.append(ddl) + + data = [_UPGRADE] + for upgrade_ddl in content.get("upgrade"): + append_ddl(upgrade_ddl) downgrade = content.get("downgrade") if downgrade: - text += _DOWNGRADE - if len(downgrade) > 1: - text += ";\n".join(downgrade) + ";\n" - else: - text += f"{downgrade[0]};\n" - version_file.write_text(text, encoding="utf-8") + data.append(_DOWNGRADE) + for downgrade_ddl in downgrade: + append_ddl(downgrade_ddl) + version_file.write_text("".join(data), encoding="utf-8") def get_models_describe(app: str) -> Dict: diff --git a/tests/test_migrate.py b/tests/test_migrate.py index 41d9dde..a3ccbb8 100644 --- a/tests/test_migrate.py +++ b/tests/test_migrate.py @@ -802,74 +802,70 @@ def test_migrate(mocker: MockerFixture): Migrate.diff_models(models_describe, old_models_describe, False) Migrate._merge_operators() if isinstance(Migrate.ddl, MysqlDDL): - expected_upgrade_operators = set( - [ - "ALTER TABLE `category` MODIFY COLUMN `name` VARCHAR(200)", - "ALTER TABLE `category` MODIFY COLUMN `slug` VARCHAR(100) NOT NULL", - "ALTER TABLE `config` ADD `user_id` INT NOT NULL COMMENT 'User'", - "ALTER TABLE `config` ADD CONSTRAINT `fk_config_user_17daa970` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE", - "ALTER TABLE `config` ALTER COLUMN `status` DROP DEFAULT", - "ALTER TABLE `config` MODIFY COLUMN `value` JSON NOT NULL", - "ALTER TABLE `email` ADD `address` VARCHAR(200) NOT NULL", - "ALTER TABLE `email` DROP COLUMN `user_id`", - "CREATE TABLE `email_user` (`email_id` INT NOT NULL REFERENCES `email` (`email_id`) ON DELETE CASCADE,`user_id` INT NOT NULL REFERENCES `user` (`id`) ON DELETE CASCADE) CHARACTER SET utf8mb4", - "ALTER TABLE `configs` RENAME TO `config`", - "ALTER TABLE `product` RENAME COLUMN `image` TO `pic`", - "ALTER TABLE `email` RENAME COLUMN `id` TO `email_id`", - "ALTER TABLE `product` ADD INDEX `idx_product_name_869427` (`name`, `type_db_alias`)", - "ALTER TABLE `email` ADD INDEX `idx_email_email_4a1a33` (`email`)", - "ALTER TABLE `product` ADD UNIQUE INDEX `uid_product_name_869427` (`name`, `type_db_alias`)", - "ALTER TABLE `product` ALTER COLUMN `view_num` SET DEFAULT 0", - "ALTER TABLE `product` MODIFY COLUMN `created_at` DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6)", - "ALTER TABLE `product` MODIFY COLUMN `is_reviewed` BOOL NOT NULL COMMENT 'Is Reviewed'", - "ALTER TABLE `user` DROP COLUMN `avatar`", - "ALTER TABLE `user` MODIFY COLUMN `password` VARCHAR(100) NOT NULL", - "ALTER TABLE `user` MODIFY COLUMN `intro` LONGTEXT NOT NULL", - "ALTER TABLE `user` MODIFY COLUMN `last_login` DATETIME(6) NOT NULL COMMENT 'Last Login'", - "ALTER TABLE `user` MODIFY COLUMN `is_active` BOOL NOT NULL COMMENT 'Is Active' DEFAULT 1", - "ALTER TABLE `user` MODIFY COLUMN `is_superuser` BOOL NOT NULL COMMENT 'Is SuperUser' DEFAULT 0", - "ALTER TABLE `user` MODIFY COLUMN `longitude` DECIMAL(10,8) NOT NULL", - "ALTER TABLE `user` ADD UNIQUE INDEX `uid_user_usernam_9987ab` (`username`)", - "CREATE TABLE IF NOT EXISTS `newmodel` (\n `id` INT NOT NULL PRIMARY KEY AUTO_INCREMENT,\n `name` VARCHAR(50) NOT NULL\n) CHARACTER SET utf8mb4;", - "ALTER TABLE `category` MODIFY COLUMN `created_at` DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6)", - "ALTER TABLE `product` MODIFY COLUMN `body` LONGTEXT NOT NULL", - "ALTER TABLE `email` MODIFY COLUMN `is_primary` BOOL NOT NULL DEFAULT 0", - ] - ) - expected_downgrade_operators = set( - [ - "ALTER TABLE `category` MODIFY COLUMN `name` VARCHAR(200) NOT NULL", - "ALTER TABLE `category` MODIFY COLUMN `slug` VARCHAR(200) NOT NULL", - "ALTER TABLE `config` DROP COLUMN `user_id`", - "ALTER TABLE `config` DROP FOREIGN KEY `fk_config_user_17daa970`", - "ALTER TABLE `config` ALTER COLUMN `status` SET DEFAULT 1", - "ALTER TABLE `email` ADD `user_id` INT NOT NULL", - "ALTER TABLE `email` DROP COLUMN `address`", - "ALTER TABLE `config` RENAME TO `configs`", - "ALTER TABLE `product` RENAME COLUMN `pic` TO `image`", - "ALTER TABLE `email` RENAME COLUMN `email_id` TO `id`", - "ALTER TABLE `product` DROP INDEX `idx_product_name_869427`", - "ALTER TABLE `email` DROP INDEX `idx_email_email_4a1a33`", - "ALTER TABLE `product` DROP INDEX `uid_product_name_869427`", - "ALTER TABLE `product` ALTER COLUMN `view_num` DROP DEFAULT", - "ALTER TABLE `user` ADD `avatar` VARCHAR(200) NOT NULL DEFAULT ''", - "ALTER TABLE `user` DROP INDEX `idx_user_usernam_9987ab`", - "ALTER TABLE `user` MODIFY COLUMN `password` VARCHAR(200) NOT NULL", - "DROP TABLE IF EXISTS `email_user`", - "DROP TABLE IF EXISTS `newmodel`", - "ALTER TABLE `user` MODIFY COLUMN `intro` LONGTEXT NOT NULL", - "ALTER TABLE `config` MODIFY COLUMN `value` TEXT NOT NULL", - "ALTER TABLE `category` MODIFY COLUMN `created_at` DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6)", - "ALTER TABLE `product` MODIFY COLUMN `created_at` DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6)", - "ALTER TABLE `product` MODIFY COLUMN `is_reviewed` BOOL NOT NULL COMMENT 'Is Reviewed'", - "ALTER TABLE `user` MODIFY COLUMN `last_login` DATETIME(6) NOT NULL COMMENT 'Last Login'", - "ALTER TABLE `user` MODIFY COLUMN `is_active` BOOL NOT NULL COMMENT 'Is Active' DEFAULT 1", - "ALTER TABLE `user` MODIFY COLUMN `is_superuser` BOOL NOT NULL COMMENT 'Is SuperUser' DEFAULT 0", - "ALTER TABLE `user` MODIFY COLUMN `longitude` DECIMAL(12,9) NOT NULL", - "ALTER TABLE `product` MODIFY COLUMN `body` LONGTEXT NOT NULL", - "ALTER TABLE `email` MODIFY COLUMN `is_primary` BOOL NOT NULL DEFAULT 0", - ] - ) + expected_upgrade_operators = { + "ALTER TABLE `category` MODIFY COLUMN `name` VARCHAR(200)", + "ALTER TABLE `category` MODIFY COLUMN `slug` VARCHAR(100) NOT NULL", + "ALTER TABLE `config` ADD `user_id` INT NOT NULL COMMENT 'User'", + "ALTER TABLE `config` ADD CONSTRAINT `fk_config_user_17daa970` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE", + "ALTER TABLE `config` ALTER COLUMN `status` DROP DEFAULT", + "ALTER TABLE `config` MODIFY COLUMN `value` JSON NOT NULL", + "ALTER TABLE `email` ADD `address` VARCHAR(200) NOT NULL", + "ALTER TABLE `email` DROP COLUMN `user_id`", + "ALTER TABLE `configs` RENAME TO `config`", + "ALTER TABLE `product` RENAME COLUMN `image` TO `pic`", + "ALTER TABLE `email` RENAME COLUMN `id` TO `email_id`", + "ALTER TABLE `product` ADD INDEX `idx_product_name_869427` (`name`, `type_db_alias`)", + "ALTER TABLE `email` ADD INDEX `idx_email_email_4a1a33` (`email`)", + "ALTER TABLE `product` ADD UNIQUE INDEX `uid_product_name_869427` (`name`, `type_db_alias`)", + "ALTER TABLE `product` ALTER COLUMN `view_num` SET DEFAULT 0", + "ALTER TABLE `product` MODIFY COLUMN `created_at` DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6)", + "ALTER TABLE `product` MODIFY COLUMN `is_reviewed` BOOL NOT NULL COMMENT 'Is Reviewed'", + "ALTER TABLE `user` DROP COLUMN `avatar`", + "ALTER TABLE `user` MODIFY COLUMN `password` VARCHAR(100) NOT NULL", + "ALTER TABLE `user` MODIFY COLUMN `intro` LONGTEXT NOT NULL", + "ALTER TABLE `user` MODIFY COLUMN `last_login` DATETIME(6) NOT NULL COMMENT 'Last Login'", + "ALTER TABLE `user` MODIFY COLUMN `is_active` BOOL NOT NULL COMMENT 'Is Active' DEFAULT 1", + "ALTER TABLE `user` MODIFY COLUMN `is_superuser` BOOL NOT NULL COMMENT 'Is SuperUser' DEFAULT 0", + "ALTER TABLE `user` MODIFY COLUMN `longitude` DECIMAL(10,8) NOT NULL", + "ALTER TABLE `user` ADD UNIQUE INDEX `uid_user_usernam_9987ab` (`username`)", + "CREATE TABLE `email_user` (\n `email_id` INT NOT NULL REFERENCES `email` (`email_id`) ON DELETE CASCADE,\n `user_id` INT NOT NULL REFERENCES `user` (`id`) ON DELETE CASCADE\n) CHARACTER SET utf8mb4", + "CREATE TABLE IF NOT EXISTS `newmodel` (\n `id` INT NOT NULL PRIMARY KEY AUTO_INCREMENT,\n `name` VARCHAR(50) NOT NULL\n) CHARACTER SET utf8mb4;", + "ALTER TABLE `category` MODIFY COLUMN `created_at` DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6)", + "ALTER TABLE `product` MODIFY COLUMN `body` LONGTEXT NOT NULL", + "ALTER TABLE `email` MODIFY COLUMN `is_primary` BOOL NOT NULL DEFAULT 0", + } + expected_downgrade_operators = { + "ALTER TABLE `category` MODIFY COLUMN `name` VARCHAR(200) NOT NULL", + "ALTER TABLE `category` MODIFY COLUMN `slug` VARCHAR(200) NOT NULL", + "ALTER TABLE `config` DROP COLUMN `user_id`", + "ALTER TABLE `config` DROP FOREIGN KEY `fk_config_user_17daa970`", + "ALTER TABLE `config` ALTER COLUMN `status` SET DEFAULT 1", + "ALTER TABLE `email` ADD `user_id` INT NOT NULL", + "ALTER TABLE `email` DROP COLUMN `address`", + "ALTER TABLE `config` RENAME TO `configs`", + "ALTER TABLE `product` RENAME COLUMN `pic` TO `image`", + "ALTER TABLE `email` RENAME COLUMN `email_id` TO `id`", + "ALTER TABLE `product` DROP INDEX `idx_product_name_869427`", + "ALTER TABLE `email` DROP INDEX `idx_email_email_4a1a33`", + "ALTER TABLE `product` DROP INDEX `uid_product_name_869427`", + "ALTER TABLE `product` ALTER COLUMN `view_num` DROP DEFAULT", + "ALTER TABLE `user` ADD `avatar` VARCHAR(200) NOT NULL DEFAULT ''", + "ALTER TABLE `user` DROP INDEX `idx_user_usernam_9987ab`", + "ALTER TABLE `user` MODIFY COLUMN `password` VARCHAR(200) NOT NULL", + "DROP TABLE IF EXISTS `email_user`", + "DROP TABLE IF EXISTS `newmodel`", + "ALTER TABLE `user` MODIFY COLUMN `intro` LONGTEXT NOT NULL", + "ALTER TABLE `config` MODIFY COLUMN `value` TEXT NOT NULL", + "ALTER TABLE `category` MODIFY COLUMN `created_at` DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6)", + "ALTER TABLE `product` MODIFY COLUMN `created_at` DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6)", + "ALTER TABLE `product` MODIFY COLUMN `is_reviewed` BOOL NOT NULL COMMENT 'Is Reviewed'", + "ALTER TABLE `user` MODIFY COLUMN `last_login` DATETIME(6) NOT NULL COMMENT 'Last Login'", + "ALTER TABLE `user` MODIFY COLUMN `is_active` BOOL NOT NULL COMMENT 'Is Active' DEFAULT 1", + "ALTER TABLE `user` MODIFY COLUMN `is_superuser` BOOL NOT NULL COMMENT 'Is SuperUser' DEFAULT 0", + "ALTER TABLE `user` MODIFY COLUMN `longitude` DECIMAL(12,9) NOT NULL", + "ALTER TABLE `product` MODIFY COLUMN `body` LONGTEXT NOT NULL", + "ALTER TABLE `email` MODIFY COLUMN `is_primary` BOOL NOT NULL DEFAULT 0", + } assert not set(Migrate.upgrade_operators).symmetric_difference(expected_upgrade_operators) assert not set(Migrate.downgrade_operators).symmetric_difference( @@ -877,74 +873,70 @@ def test_migrate(mocker: MockerFixture): ) elif isinstance(Migrate.ddl, PostgresDDL): - expected_upgrade_operators = set( - [ - 'ALTER TABLE "category" ALTER COLUMN "name" DROP NOT NULL', - 'ALTER TABLE "category" ALTER COLUMN "slug" TYPE VARCHAR(100) USING "slug"::VARCHAR(100)', - 'ALTER TABLE "category" ALTER COLUMN "created_at" TYPE TIMESTAMPTZ USING "created_at"::TIMESTAMPTZ', - 'ALTER TABLE "config" ADD "user_id" INT NOT NULL', - 'ALTER TABLE "config" ADD CONSTRAINT "fk_config_user_17daa970" FOREIGN KEY ("user_id") REFERENCES "user" ("id") ON DELETE CASCADE', - 'ALTER TABLE "config" ALTER COLUMN "status" DROP DEFAULT', - 'ALTER TABLE "config" ALTER COLUMN "value" TYPE JSONB USING "value"::JSONB', - 'ALTER TABLE "configs" RENAME TO "config"', - 'ALTER TABLE "email" ADD "address" VARCHAR(200) NOT NULL', - 'ALTER TABLE "email" DROP COLUMN "user_id"', - 'ALTER TABLE "email" RENAME COLUMN "id" TO "email_id"', - 'ALTER TABLE "email" ALTER COLUMN "is_primary" TYPE BOOL USING "is_primary"::BOOL', - 'ALTER TABLE "product" ALTER COLUMN "view_num" SET DEFAULT 0', - 'ALTER TABLE "product" RENAME COLUMN "image" TO "pic"', - 'ALTER TABLE "product" ALTER COLUMN "is_reviewed" TYPE BOOL USING "is_reviewed"::BOOL', - 'ALTER TABLE "product" ALTER COLUMN "body" TYPE TEXT USING "body"::TEXT', - 'ALTER TABLE "product" ALTER COLUMN "created_at" TYPE TIMESTAMPTZ USING "created_at"::TIMESTAMPTZ', - 'ALTER TABLE "user" ALTER COLUMN "password" TYPE VARCHAR(100) USING "password"::VARCHAR(100)', - 'ALTER TABLE "user" DROP COLUMN "avatar"', - 'ALTER TABLE "user" ALTER COLUMN "is_superuser" TYPE BOOL USING "is_superuser"::BOOL', - 'ALTER TABLE "user" ALTER COLUMN "last_login" TYPE TIMESTAMPTZ USING "last_login"::TIMESTAMPTZ', - 'ALTER TABLE "user" ALTER COLUMN "intro" TYPE TEXT USING "intro"::TEXT', - 'ALTER TABLE "user" ALTER COLUMN "is_active" TYPE BOOL USING "is_active"::BOOL', - 'ALTER TABLE "user" ALTER COLUMN "longitude" TYPE DECIMAL(10,8) USING "longitude"::DECIMAL(10,8)', - 'CREATE INDEX "idx_product_name_869427" ON "product" ("name", "type_db_alias")', - 'CREATE INDEX "idx_email_email_4a1a33" ON "email" ("email")', - 'CREATE TABLE "email_user" ("email_id" INT NOT NULL REFERENCES "email" ("email_id") ON DELETE CASCADE,"user_id" INT NOT NULL REFERENCES "user" ("id") ON DELETE CASCADE)', - 'CREATE TABLE IF NOT EXISTS "newmodel" (\n "id" SERIAL NOT NULL PRIMARY KEY,\n "name" VARCHAR(50) NOT NULL\n);\nCOMMENT ON COLUMN "config"."user_id" IS \'User\';', - 'CREATE UNIQUE INDEX "uid_product_name_869427" ON "product" ("name", "type_db_alias")', - 'CREATE UNIQUE INDEX "uid_user_usernam_9987ab" ON "user" ("username")', - ] - ) - expected_downgrade_operators = set( - [ - 'ALTER TABLE "category" ALTER COLUMN "name" SET NOT NULL', - 'ALTER TABLE "category" ALTER COLUMN "slug" TYPE VARCHAR(200) USING "slug"::VARCHAR(200)', - 'ALTER TABLE "category" ALTER COLUMN "created_at" TYPE TIMESTAMPTZ USING "created_at"::TIMESTAMPTZ', - 'ALTER TABLE "config" ALTER COLUMN "status" SET DEFAULT 1', - 'ALTER TABLE "config" DROP COLUMN "user_id"', - 'ALTER TABLE "config" DROP CONSTRAINT "fk_config_user_17daa970"', - 'ALTER TABLE "config" RENAME TO "configs"', - 'ALTER TABLE "config" ALTER COLUMN "value" TYPE JSONB USING "value"::JSONB', - 'ALTER TABLE "email" ADD "user_id" INT NOT NULL', - 'ALTER TABLE "email" DROP COLUMN "address"', - 'ALTER TABLE "email" RENAME COLUMN "email_id" TO "id"', - 'ALTER TABLE "email" ALTER COLUMN "is_primary" TYPE BOOL USING "is_primary"::BOOL', - 'ALTER TABLE "product" ALTER COLUMN "view_num" DROP DEFAULT', - 'ALTER TABLE "product" RENAME COLUMN "pic" TO "image"', - 'ALTER TABLE "user" ADD "avatar" VARCHAR(200) NOT NULL DEFAULT \'\'', - 'ALTER TABLE "user" ALTER COLUMN "password" TYPE VARCHAR(200) USING "password"::VARCHAR(200)', - 'ALTER TABLE "user" ALTER COLUMN "last_login" TYPE TIMESTAMPTZ USING "last_login"::TIMESTAMPTZ', - 'ALTER TABLE "user" ALTER COLUMN "is_superuser" TYPE BOOL USING "is_superuser"::BOOL', - 'ALTER TABLE "user" ALTER COLUMN "is_active" TYPE BOOL USING "is_active"::BOOL', - 'ALTER TABLE "user" ALTER COLUMN "intro" TYPE TEXT USING "intro"::TEXT', - 'ALTER TABLE "user" ALTER COLUMN "longitude" TYPE DECIMAL(12,9) USING "longitude"::DECIMAL(12,9)', - 'ALTER TABLE "product" ALTER COLUMN "created_at" TYPE TIMESTAMPTZ USING "created_at"::TIMESTAMPTZ', - 'ALTER TABLE "product" ALTER COLUMN "is_reviewed" TYPE BOOL USING "is_reviewed"::BOOL', - 'ALTER TABLE "product" ALTER COLUMN "body" TYPE TEXT USING "body"::TEXT', - 'DROP INDEX "idx_product_name_869427"', - 'DROP INDEX "idx_email_email_4a1a33"', - 'DROP INDEX "idx_user_usernam_9987ab"', - 'DROP INDEX "uid_product_name_869427"', - 'DROP TABLE IF EXISTS "email_user"', - 'DROP TABLE IF EXISTS "newmodel"', - ] - ) + expected_upgrade_operators = { + 'ALTER TABLE "category" ALTER COLUMN "name" DROP NOT NULL', + 'ALTER TABLE "category" ALTER COLUMN "slug" TYPE VARCHAR(100) USING "slug"::VARCHAR(100)', + 'ALTER TABLE "category" ALTER COLUMN "created_at" TYPE TIMESTAMPTZ USING "created_at"::TIMESTAMPTZ', + 'ALTER TABLE "config" ADD "user_id" INT NOT NULL', + 'ALTER TABLE "config" ADD CONSTRAINT "fk_config_user_17daa970" FOREIGN KEY ("user_id") REFERENCES "user" ("id") ON DELETE CASCADE', + 'ALTER TABLE "config" ALTER COLUMN "status" DROP DEFAULT', + 'ALTER TABLE "config" ALTER COLUMN "value" TYPE JSONB USING "value"::JSONB', + 'ALTER TABLE "configs" RENAME TO "config"', + 'ALTER TABLE "email" ADD "address" VARCHAR(200) NOT NULL', + 'ALTER TABLE "email" DROP COLUMN "user_id"', + 'ALTER TABLE "email" RENAME COLUMN "id" TO "email_id"', + 'ALTER TABLE "email" ALTER COLUMN "is_primary" TYPE BOOL USING "is_primary"::BOOL', + 'ALTER TABLE "product" ALTER COLUMN "view_num" SET DEFAULT 0', + 'ALTER TABLE "product" RENAME COLUMN "image" TO "pic"', + 'ALTER TABLE "product" ALTER COLUMN "is_reviewed" TYPE BOOL USING "is_reviewed"::BOOL', + 'ALTER TABLE "product" ALTER COLUMN "body" TYPE TEXT USING "body"::TEXT', + 'ALTER TABLE "product" ALTER COLUMN "created_at" TYPE TIMESTAMPTZ USING "created_at"::TIMESTAMPTZ', + 'ALTER TABLE "user" ALTER COLUMN "password" TYPE VARCHAR(100) USING "password"::VARCHAR(100)', + 'ALTER TABLE "user" DROP COLUMN "avatar"', + 'ALTER TABLE "user" ALTER COLUMN "is_superuser" TYPE BOOL USING "is_superuser"::BOOL', + 'ALTER TABLE "user" ALTER COLUMN "last_login" TYPE TIMESTAMPTZ USING "last_login"::TIMESTAMPTZ', + 'ALTER TABLE "user" ALTER COLUMN "intro" TYPE TEXT USING "intro"::TEXT', + 'ALTER TABLE "user" ALTER COLUMN "is_active" TYPE BOOL USING "is_active"::BOOL', + 'ALTER TABLE "user" ALTER COLUMN "longitude" TYPE DECIMAL(10,8) USING "longitude"::DECIMAL(10,8)', + 'CREATE INDEX "idx_product_name_869427" ON "product" ("name", "type_db_alias")', + 'CREATE INDEX "idx_email_email_4a1a33" ON "email" ("email")', + 'CREATE TABLE "email_user" (\n "email_id" INT NOT NULL REFERENCES "email" ("email_id") ON DELETE CASCADE,\n "user_id" INT NOT NULL REFERENCES "user" ("id") ON DELETE CASCADE\n)', + 'CREATE TABLE IF NOT EXISTS "newmodel" (\n "id" SERIAL NOT NULL PRIMARY KEY,\n "name" VARCHAR(50) NOT NULL\n);\nCOMMENT ON COLUMN "config"."user_id" IS \'User\';', + 'CREATE UNIQUE INDEX "uid_product_name_869427" ON "product" ("name", "type_db_alias")', + 'CREATE UNIQUE INDEX "uid_user_usernam_9987ab" ON "user" ("username")', + } + expected_downgrade_operators = { + 'ALTER TABLE "category" ALTER COLUMN "name" SET NOT NULL', + 'ALTER TABLE "category" ALTER COLUMN "slug" TYPE VARCHAR(200) USING "slug"::VARCHAR(200)', + 'ALTER TABLE "category" ALTER COLUMN "created_at" TYPE TIMESTAMPTZ USING "created_at"::TIMESTAMPTZ', + 'ALTER TABLE "config" ALTER COLUMN "status" SET DEFAULT 1', + 'ALTER TABLE "config" DROP COLUMN "user_id"', + 'ALTER TABLE "config" DROP CONSTRAINT "fk_config_user_17daa970"', + 'ALTER TABLE "config" RENAME TO "configs"', + 'ALTER TABLE "config" ALTER COLUMN "value" TYPE JSONB USING "value"::JSONB', + 'ALTER TABLE "email" ADD "user_id" INT NOT NULL', + 'ALTER TABLE "email" DROP COLUMN "address"', + 'ALTER TABLE "email" RENAME COLUMN "email_id" TO "id"', + 'ALTER TABLE "email" ALTER COLUMN "is_primary" TYPE BOOL USING "is_primary"::BOOL', + 'ALTER TABLE "product" ALTER COLUMN "view_num" DROP DEFAULT', + 'ALTER TABLE "product" RENAME COLUMN "pic" TO "image"', + 'ALTER TABLE "user" ADD "avatar" VARCHAR(200) NOT NULL DEFAULT \'\'', + 'ALTER TABLE "user" ALTER COLUMN "password" TYPE VARCHAR(200) USING "password"::VARCHAR(200)', + 'ALTER TABLE "user" ALTER COLUMN "last_login" TYPE TIMESTAMPTZ USING "last_login"::TIMESTAMPTZ', + 'ALTER TABLE "user" ALTER COLUMN "is_superuser" TYPE BOOL USING "is_superuser"::BOOL', + 'ALTER TABLE "user" ALTER COLUMN "is_active" TYPE BOOL USING "is_active"::BOOL', + 'ALTER TABLE "user" ALTER COLUMN "intro" TYPE TEXT USING "intro"::TEXT', + 'ALTER TABLE "user" ALTER COLUMN "longitude" TYPE DECIMAL(12,9) USING "longitude"::DECIMAL(12,9)', + 'ALTER TABLE "product" ALTER COLUMN "created_at" TYPE TIMESTAMPTZ USING "created_at"::TIMESTAMPTZ', + 'ALTER TABLE "product" ALTER COLUMN "is_reviewed" TYPE BOOL USING "is_reviewed"::BOOL', + 'ALTER TABLE "product" ALTER COLUMN "body" TYPE TEXT USING "body"::TEXT', + 'DROP INDEX "idx_product_name_869427"', + 'DROP INDEX "idx_email_email_4a1a33"', + 'DROP INDEX "idx_user_usernam_9987ab"', + 'DROP INDEX "uid_product_name_869427"', + 'DROP TABLE IF EXISTS "email_user"', + 'DROP TABLE IF EXISTS "newmodel"', + } assert not set(Migrate.upgrade_operators).symmetric_difference(expected_upgrade_operators) assert not set(Migrate.downgrade_operators).symmetric_difference( expected_downgrade_operators diff --git a/tests/test_utils.py b/tests/test_utils.py new file mode 100644 index 0000000..fa1f02f --- /dev/null +++ b/tests/test_utils.py @@ -0,0 +1,34 @@ +import tempfile +from pathlib import Path + +from aerich.utils import write_version_file + + +def test_write_version_file(): + content = { + "upgrade": [ + "CREATE TABLE IF NOT EXISTS `newmodel` (\n `id` INT NOT NULL PRIMARY KEY AUTO_INCREMENT,\n `name` VARCHAR(50) NOT NULL\n) CHARACTER SET utf8mb4;", + "CREATE TABLE `email_user` (\n `email_id` INT NOT NULL REFERENCES `email` (`email_id`) ON DELETE CASCADE,\n `user_id` INT NOT NULL REFERENCES `user` (`id`) ON DELETE CASCADE\n) CHARACTER SET utf8mb4", + ], + "downgrade": [ + "DROP TABLE IF EXISTS `email_user`", + "DROP TABLE IF EXISTS `newmodel`", + ], + } + with tempfile.NamedTemporaryFile(mode="r", delete=True) as f: + write_version_file(Path(f.name), content) + result = f.read() + assert result == ( + "-- upgrade --\n" + "CREATE TABLE IF NOT EXISTS `newmodel` (\n" + " `id` INT NOT NULL PRIMARY KEY AUTO_INCREMENT,\n" + " `name` VARCHAR(50) NOT NULL\n" + ") CHARACTER SET utf8mb4;\n" + "CREATE TABLE `email_user` (\n" + " `email_id` INT NOT NULL REFERENCES `email` (`email_id`) ON DELETE CASCADE,\n" + " `user_id` INT NOT NULL REFERENCES `user` (`id`) ON DELETE CASCADE\n" + ") CHARACTER SET utf8mb4;\n" + "-- downgrade --\n" + "DROP TABLE IF EXISTS `email_user`;\n" + "DROP TABLE IF EXISTS `newmodel`;\n" + )