Fix duplicated semicolon in table creation DDL

aerich/utils.py

@@ -110,25 +110,22 @@ def write_version_file(version_file: Path, content: Dict):
     :param content:
     :return:
     """
-    with open(version_file, "w", encoding="utf-8") as f:
+
-        f.write(_UPGRADE)
+    def append_ddl(ddl: str):
-        upgrade = content.get("upgrade")
+        if not ddl.endswith(";"):
-        if len(upgrade) > 1:
+            ddl += ";"
-            f.write(";\n".join(upgrade))
+        ddl += "\n"
-            if not upgrade[-1].endswith(";"):
+        data.append(ddl)
-                f.write(";\n")
+
-        else:
+    data = [_UPGRADE]
-            f.write(f"{upgrade[0]}")
+    for upgrade_ddl in content.get("upgrade"):
-            if not upgrade[0].endswith(";"):
+        append_ddl(upgrade_ddl)
-                f.write(";")
+    downgrade = content.get("downgrade")
-            f.write("\n")
+    if downgrade:
-        downgrade = content.get("downgrade")
+        data.append(_DOWNGRADE)
-        if downgrade:
+        for downgrade_ddl in downgrade:
-            f.write(_DOWNGRADE)
+            append_ddl(downgrade_ddl)
-            if len(downgrade) > 1:
+    version_file.write_text("".join(data))
-                f.write(";\n".join(downgrade) + ";\n")
-            else:
-                f.write(f"{downgrade[0]};\n")
 
 
 def get_models_describe(app: str) -> Dict:

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"
+        )