From 28d19a4b7b1e5ca7ee1af66a49e4f2be891067a1 Mon Sep 17 00:00:00 2001
From: long2ice <long2ice@gmail.com>
Date: Mon, 26 Sep 2022 18:36:57 +0800
Subject: [PATCH] - Fix syntax error with python3.8.10. (#265) - Fix sql
 generate error. (#263)

---
 CHANGELOG.md      |  5 +++++
 aerich/migrate.py | 25 +++++++++++--------------
 aerich/version.py |  2 +-
 pyproject.toml    |  2 +-
 tests/models.py   |  2 --
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6d7a0b..799897b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## 0.7
 
+### 0.7.1rc2
+
+- Fix syntax error with python3.8.10. (#265)
+- Fix sql generate error. (#263)
+
 ### 0.7.1rc1
 
 - Fix postgres sql error (#263)
diff --git a/aerich/migrate.py b/aerich/migrate.py
index c708e59..338af80 100644
--- a/aerich/migrate.py
+++ b/aerich/migrate.py
@@ -15,21 +15,17 @@ from aerich.ddl import BaseDDL
 from aerich.models import MAX_VERSION_LENGTH, Aerich
 from aerich.utils import get_app_connection, get_models_describe, is_default_function
 
-MIGRATE_TEMPLATE = """from typing import List
-
-from tortoise import BaseDBAsyncClient
+MIGRATE_TEMPLATE = """from tortoise import BaseDBAsyncClient
 
 
-async def upgrade(db: BaseDBAsyncClient) -> List[str]:
-    return [
-        {upgrade_sql}
-    ]
+async def upgrade(db: BaseDBAsyncClient) -> str:
+    return \"\"\"
+        {upgrade_sql}\"\"\"
 
 
-async def downgrade(db: BaseDBAsyncClient) -> List[str]:
-    return [
-        {downgrade_sql}
-    ]
+async def downgrade(db: BaseDBAsyncClient) -> str:
+    return \"\"\"
+        {downgrade_sql}\"\"\"
 """
 
 
@@ -52,7 +48,7 @@ class Migrate:
     _db_version: Optional[str] = None
 
     @classmethod
-    def get_all_version_files(cls) -> list[str]:
+    def get_all_version_files(cls) -> List[str]:
         return sorted(
             filter(lambda x: x.endswith("py"), os.listdir(cls.migrate_location)),
             key=lambda x: int(x.split("_")[0]),
@@ -125,9 +121,10 @@ class Migrate:
 
         version_file = Path(cls.migrate_location, version)
         content = MIGRATE_TEMPLATE.format(
-            upgrade_sql=",\n        ".join(map(lambda x: f"'{x}'", cls.upgrade_operators)),
-            downgrade_sql=",\n        ".join(map(lambda x: f"'{x}'", cls.downgrade_operators)),
+            upgrade_sql=";\n        ".join(cls.upgrade_operators) + ";",
+            downgrade_sql=";\n        ".join(cls.downgrade_operators) + ";",
         )
+
         with open(version_file, "w", encoding="utf-8") as f:
             f.write(content)
         return version
diff --git a/aerich/version.py b/aerich/version.py
index 671a509..d4e464e 100644
--- a/aerich/version.py
+++ b/aerich/version.py
@@ -1 +1 @@
-__version__ = "0.7.1rc1"
+__version__ = "0.7.1rc2"
diff --git a/pyproject.toml b/pyproject.toml
index fa3b3b4..10c68af 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aerich"
-version = "0.7.1rc1"
+version = "0.7.1rc2"
 description = "A database migrations tool for Tortoise ORM."
 authors = ["long2ice <long2ice@gmail.com>"]
 license = "Apache-2.0"
diff --git a/tests/models.py b/tests/models.py
index 597ee59..923c339 100644
--- a/tests/models.py
+++ b/tests/models.py
@@ -28,8 +28,6 @@ class User(Model):
     last_login = fields.DatetimeField(description="Last Login", default=datetime.datetime.now)
     is_active = fields.BooleanField(default=True, description="Is Active")
     is_superuser = fields.BooleanField(default=False, description="Is SuperUser")
-    intro = fields.TextField(default="")
-    longitude = fields.DecimalField(max_digits=10, decimal_places=8)
 
 
 class Email(Model):