feat: add Cases (#1)

* feat: add Cases

* style

Author: NightMarcher

README.md

@@ -107,9 +107,9 @@ Generate sql and execute
     WHERE `id`=8
 ```
 
-### **upsert_on_duplicated**
+### **upsert_on_duplicate**
 ```python
-await AccountMgr.upsert_on_duplicated(
+await AccountMgr.upsert_on_duplicate(
     [
         {'id': 7, 'gender': 1, 'name': '斉藤 修平', 'locale': 'ja_JP', 'extend': {}},
         {'id': 8, 'gender': 1, 'name': 'Ojas Salvi', 'locale': 'en_IN', 'extend': {}},
@@ -133,8 +133,9 @@ Generate sql and execute
 ```python
 await AccountMgr.insert_into_select(
     wheres=Q(id__in=[4, 5, 6]),
-    remain_fields=["gender", "locale"],
+    remain_fields=["gender"],
     assign_field_dict={
+        "locale": Cases("id", {3: LocaleEnum.zh_CN, 4: LocaleEnum.en_US, 5: LocaleEnum.fr_FR}, default=""),
         "active": False,
         "name": RawSQL("CONCAT(LEFT(name, 26), ' [NEW]')"),
         "extend": {},
@@ -146,14 +147,14 @@ Generate sql and execute
 ```sql
     INSERT INTO account_bak
         (gender, locale, active, name, extend)
-    SELECT gender, locale, False active, CONCAT(LEFT(name, 26), ' [NEW]') 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)
 ```
 
-### **bulk_update_with_fly_table**
+### **bulk_update**
 ```python
-await AccountMgr.bulk_update_with_fly_table(
+await AccountMgr.bulk_update(
     [
         {'id': 7, 'active': False, 'gender': <GenderEnum.male: 1>},
         {'id': 15, 'active': True, 'gender': <GenderEnum.unknown: 0>}

examples/service/routers/account.py

@@ -3,7 +3,7 @@
 
 from faker import Faker
 from fastapi import APIRouter, Body, Query
-from fastapi_esql import RawSQL
+from fastapi_esql import Cases, RawSQL
 from pydantic import BaseModel, Field
 from tortoise.queryset import Q
 
@@ -149,7 +149,7 @@ async def bulk_upsert_view():
             "locale": locale.value,
             "extend": {},
         })
-    row_cnt = await AccountMgr.upsert_on_duplicated(
+    row_cnt = await AccountMgr.upsert_on_duplicate(
         dicts,
         insert_fields=["id", "gender", "name", "locale", "extend"],
         upsert_fields=["name", "locale"],
@@ -164,8 +164,9 @@ async def bulk_clone_view(
 ):
     ok = await AccountMgr.insert_into_select(
         wheres=Q(id__in=aids),
-        remain_fields=["gender", "locale"],
+        remain_fields=["gender"],
         assign_field_dict={
+            "locale": Cases("id", {3: LocaleEnum.zh_CN, 4: LocaleEnum.en_US, 5: LocaleEnum.fr_FR}, default=""),
             "active": False,
             "name": RawSQL("CONCAT(LEFT(name, 26), ' [NEW]')"),
             "extend": {},
@@ -184,7 +185,7 @@ class UpdateIn(BaseModel):
 async def bulk_update_view(
     dicts: List[UpdateIn] = Body(..., embed=True),
 ):
-    row_cnt = await AccountMgr.bulk_update_with_fly_table(
+    row_cnt = await AccountMgr.bulk_update(
         [d.dict() for d in dicts],
         join_fields=["id"],
         update_fields=["active", "gender"],

fastapi_esql/__init__.py

@@ -11,12 +11,13 @@
 )
 from .utils import (
     CursorHandler,
+    Cases,
     RawSQL,
     SQLizer,
     timing,
 )
 
-__version__ = "0.0.3"
+__version__ = "0.0.4"
 
 __all__ = [
     "QsParsingError",
@@ -25,6 +26,7 @@
     "BaseManager",
     "BaseModel",
     "CursorHandler",
+    "Cases",
     "RawSQL",
     "SQLizer",
     "timing",

fastapi_esql/orm/base_manager.py

@@ -105,14 +105,14 @@ async def update_json_field(
         return await CursorHandler.sum_row_cnt(sql, cls.rw_conn, logger)
 
     @classmethod
-    async def upsert_on_duplicated(
+    async def upsert_on_duplicate(
         cls,
         dicts: List[Dict[str, Any]],
         insert_fields: List[str],
         upsert_fields: List[str],
         using_values: bool = False,
     ):
-        sql = SQLizer.upsert_on_duplicated(
+        sql = SQLizer.upsert_on_duplicate(
             cls.table,
             dicts,
             insert_fields,
@@ -140,14 +140,14 @@ async def insert_into_select(
         return await CursorHandler.exec_if_ok(sql, cls.rw_conn, logger)
 
     @classmethod
-    async def bulk_update_with_fly_table(
+    async def bulk_update(
         cls,
         dicts: List[Dict[str, Any]],
         join_fields: List[str],
         update_fields: List[str],
         using_values: bool = True,
     ):
-        sql = SQLizer.bulk_update_with_fly_table(
+        sql = SQLizer.bulk_update(
             cls.table,
             dicts,
             join_fields,

fastapi_esql/utils/__init__.py

@@ -1,3 +1,3 @@
 from .cursor_handler import CursorHandler
 from .decorator import timing
-from .sqlizer import RawSQL, SQLizer
+from .sqlizer import Cases, RawSQL, SQLizer

fastapi_esql/utils/sqlizer.py

@@ -20,6 +20,27 @@ def __init__(self, sql: str):
             self.sql = sql
 
 
+class Cases:
+    """
+    Simple case statement, like:
+    'CASE `feild` WHEN ... THEN ... ELSE <default> END'.
+    If your statement is more complex, please use RawSQL directly.
+    """
+    def __init__(self, field: str, whens: dict, default=None):
+        self.field = field
+        self.whens = whens
+        self.default = default
+
+    @property
+    def sql(self):
+        whens = " ".join(
+            f"WHEN {k} THEN {SQLizer._sqlize_value(v)}"
+            for k, v in self.whens.items()
+        )
+        else_ = " ELSE " + SQLizer._sqlize_value(self.default) if self.default is not None else ""
+        return f"CASE {self.field} {whens}{else_} END"
+
+
 class SQLizer:
 
     @classmethod
@@ -68,7 +89,7 @@ def _sqlize_value(cls, value, to_json=False) -> str:
         """
         if value is None:
             return "NULL"
-        elif isinstance(value, RawSQL):
+        elif isinstance(value, (Cases, RawSQL)):
             return value.sql
         elif isinstance(value, (int, float, bool)):
             return f"{value}"
@@ -158,7 +179,7 @@ def update_json_field(
         return sql
 
     @classmethod
-    def upsert_on_duplicated(
+    def upsert_on_duplicate(
         cls,
         table: str,
         dicts: List[Dict[str, Any]],
@@ -254,7 +275,7 @@ def build_fly_table(
         return sql
 
     @classmethod
-    def bulk_update_with_fly_table(
+    def bulk_update(
         cls,
         table: str,
         dicts: List[Dict[str, Any]],