style: make sql more compact

Author: NightMarcher

README.md

@@ -49,7 +49,7 @@ await AccountMgr.select_custom_fields(
 Generate sql and execute
 ```sql
     SELECT
-        id, extend ->> '$.last_login.ipv4' ipv4, extend ->> '$.last_login.start_datetime' start_datetime, CAST(extend ->> '$.last_login.online_sec' AS SIGNED) online_sec
+      id, extend ->> '$.last_login.ipv4' ipv4, extend ->> '$.last_login.start_datetime' start_datetime, CAST(extend ->> '$.last_login.online_sec' AS SIGNED) online_sec
     FROM account
     WHERE id IN (1,2,3) AND gender=1
 ```
@@ -70,7 +70,7 @@ await AccountMgr.select_custom_fields(
 Generate sql and execute
 ```sql
     SELECT
-        locale, gender, COUNT(1) cnt
+      locale, gender, COUNT(1) cnt
     FROM account
     WHERE `id` BETWEEN 1 AND 12
     GROUP BY locale, gender
@@ -123,9 +123,11 @@ await AccountMgr.upsert_on_duplicate(
 Generate sql and execute
 ```sql
     INSERT INTO account
-        (id, gender, name, locale, extend)
+      (id, gender, name, locale, extend)
     VALUES
-        (7, 1, '斉藤 修平', 'ja_JP', '{}'), (8, 1, 'Ojas Salvi', 'en_IN', '{}'), (9, 1, '羊淑兰', 'zh_CN', '{}')
+      (7, 1, '斉藤 修平', 'ja_JP', '{}'),
+      (8, 1, 'Ojas Salvi', 'en_IN', '{}'),
+      (9, 1, '羊淑兰', 'zh_CN', '{}')
     AS `new_account` ON DUPLICATE KEY UPDATE name=`new_account`.name, locale=`new_account`.locale
 ```
 
@@ -146,7 +148,7 @@ await AccountMgr.insert_into_select(
 Generate sql and execute
 ```sql
     INSERT INTO account_bak
-        (gender, locale, active, name, extend)
+      (gender, locale, active, name, extend)
     SELECT gender, CASE id WHEN 3 THEN 'zh_CN' WHEN 4 THEN 'en_US' WHEN 5 THEN 'fr_FR' ELSE '' END locale, False active, CONCAT(LEFT(name, 26), ' [NEW]') name, '{}' extend
     FROM account
     WHERE `id` IN (4,5,6)
@@ -169,8 +171,9 @@ Generate sql and execute
     UPDATE account
     JOIN (
         SELECT * FROM (
-            VALUES
-            ROW(7, False, 1), ROW(15, True, 0)
+          VALUES
+          ROW(7, False, 1),
+          ROW(15, True, 0)
         ) AS fly_table (id, active, gender)
     ) tmp ON account.id=tmp.id
     SET account.active=tmp.active, account.gender=tmp.gender

fastapi_esql/__init__.py

@@ -1,5 +1,7 @@
 from logging.config import dictConfig
 
+from tortoise.queryset import Q
+
 from .const import (
     QsParsingError,
     WrongParamsError,
@@ -18,7 +20,7 @@
     timing,
 )
 
-__version__ = "0.0.6"
+__version__ = "0.0.7"
 
 __all__ = [
     "QsParsingError",
@@ -28,6 +30,7 @@
     "BaseModel",
     "CursorHandler",
     "Cases",
+    "Q",
     "RawSQL",
     "SQLizer",
     "Singleton",

fastapi_esql/utils/sqlizer.py

@@ -134,7 +134,7 @@ def select_custom_fields(
 
         sql = """
     SELECT
-        {}
+      {}
     FROM {}
     WHERE {}
 {}""".format(
@@ -196,26 +196,31 @@ def upsert_on_duplicate(
             raise WrongParamsError("Please check your params")
 
         values = [
-            f"({', '.join(cls.sqlize_value(d.get(f)) for f in insert_fields)})"
+            f"      ({', '.join(cls.sqlize_value(d.get(f)) for f in insert_fields)})"
             for d in dicts
         ]
         # NOTE Beginning with MySQL 8.0.19, it is possible to use an alias for the row
         # https://dev.mysql.com/doc/refman/8.0/en/insert-on-duplicate.html
         if using_values:
             upserts = [f"{field}=VALUES({field})" for field in upsert_fields]
-            on_duplicated = f"ON DUPLICATE KEY UPDATE {', '.join(upserts)}"
+            on_duplicate = f"ON DUPLICATE KEY UPDATE {', '.join(upserts)}"
         else:
             new_table = f"`new_{table}`"
             upserts = [f"{field}={new_table}.{field}" for field in upsert_fields]
-            on_duplicated = f"AS {new_table} ON DUPLICATE KEY UPDATE {', '.join(upserts)}"
+            on_duplicate = f"AS {new_table} ON DUPLICATE KEY UPDATE {', '.join(upserts)}"
 
-        sql = f"""
-    INSERT INTO {table}
-        ({", ".join(insert_fields)})
+        sql = """
+    INSERT INTO {}
+      ({})
     VALUES
-        {", ".join(values)}
-    {on_duplicated}
-    """
+{}
+    {}
+    """.format(
+        table,
+        ", ".join(insert_fields),
+        ",\n".join(values),
+        on_duplicate,
+    )
         logger.debug(sql)
         return sql
 
@@ -240,7 +245,7 @@ def insert_into_select(
 
         sql = f"""
     INSERT INTO {to_table or table}
-        ({", ".join(fields)})
+      ({", ".join(fields)})
     SELECT {", ".join(remain_fields + assign_fields)}
     FROM {table}
     WHERE {cls.resolve_wheres(wheres, model)}"""
@@ -259,22 +264,22 @@ def build_fly_table(
 
         if using_values:
             rows = [
-                f"ROW({', '.join(cls.sqlize_value(d.get(f)) for f in fields)})"
+                f"          ROW({', '.join(cls.sqlize_value(d.get(f)) for f in fields)})"
                 for d in dicts
             ]
-            values = "VALUES\n            " + ", ".join(rows)
+            values = "VALUES\n" + ",\n".join(rows)
             table = f"fly_table ({', '.join(fields)})"
         else:
             rows = [
                 f"SELECT {', '.join(f'{cls.sqlize_value(d.get(f))} {f}' for f in fields)}"
                 for d in dicts
             ]
-            values = " UNION ".join(rows)
+            values = "      " + "\n          UNION ".join(rows)
             table = "fly_table"
 
         sql = f"""
         SELECT * FROM (
-            {values}
+          {values}
         ) AS {table}"""
         logger.debug(sql)
         return sql