fix: deprecation warning of VALUES function

Author: NightMarcher

README.md

@@ -28,6 +28,7 @@ class AccountMgr(BaseManager, metaclass=DemoMetaclass):
 
 ## Some supported efficient sql
 ### **select_custom_fields**
+**without `groupbys`**
 ```python
 await AccountMgr.select_custom_fields(
     fields=[
@@ -46,6 +47,7 @@ Generate sql and execute
     WHERE id IN (1, 2, 3)
 ```
 
+**with `groupbys`**
 ```python
 await AccountMgr.select_custom_fields(
     fields=[
@@ -90,9 +92,9 @@ Generate sql and execute
 ```python
 await AccountMgr.upsert_on_duplicated(
     [
-        {'id': 7, 'gender': 1, 'name': '松田 陽一', 'locale': 'ja_JP', 'extend': {}},
-        {'id': 8, 'gender': 2, 'name': 'Zeeshan Kadakia', 'locale': 'en_IN', 'extend': {}},
-        {'id': 9, 'gender': 0, 'name': '姜淑珍', 'locale': 'zh_CN', 'extend': {}}
+        {'id': 7, 'gender': 1, 'name': '斉藤 修平', 'locale': 'ja_JP', 'extend': {}},
+        {'id': 8, 'gender': 1, 'name': 'Ojas Salvi', 'locale': 'en_IN', 'extend': {}},
+        {'id': 9, 'gender': 1, 'name': '羊淑兰', 'locale': 'zh_CN', 'extend': {}}
     ],
     insert_fields=["id", "gender", "name", "locale", "extend"],
     upsert_fields=["name", "locale"],
@@ -103,8 +105,9 @@ Generate sql and execute
     INSERT INTO account
         (id, gender, name, locale, extend)
     VALUES
-        (7, 1, '松田 陽一', 'ja_JP', '{}'), (8, 2, 'Zeeshan Kadakia', 'en_IN', '{}'), (9, 0, '姜淑珍', 'zh_CN', '{}')
-    ON DUPLICATE KEY UPDATE name=VALUES(name), locale=VALUES(locale)
+        (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
 ```
 
 ### **insert_into_select**

examples/service/routers/account.py

@@ -78,8 +78,14 @@ async def bulk_init_view():
                 }
             }
         })
-    logger.debug(dicts)
-    ok = await AccountMgr.bulk_create_from_dicts(dicts)
+    # logger.debug(dicts)
+    ok = await AccountMgr.bulk_create_from_dicts(
+        dicts,
+        batch_size=5,
+        # ignore_conflicts=True,
+        update_fields=["gender", "name", "locale"],
+        on_conflict=["id"],
+    )
     return {"ok": ok}
 
 

fastapi_esql/orm/base_manager.py

@@ -46,10 +46,12 @@ async def update_from_dict(cls, obj: Model, params: Dict[str, Any]) -> bool:
             return False
 
     @classmethod
-    async def bulk_create_from_dicts(cls, dicts: List[Dict[str, Any]]) -> bool:
+    async def bulk_create_from_dicts(cls, dicts: List[Dict[str, Any]], **kwargs) -> bool:
         try:
+            # NOTE Here is a bug in bulk_create. https://github.com/tortoise/tortoise-orm/issues/1281
             await cls.model.bulk_create(
                 objects=[cls.model(**d) for d in dicts],
+                **kwargs,
                 using_db=cls.rw_conn,
             )
             return True

fastapi_esql/utils/sqlizer.py

@@ -29,7 +29,7 @@ def _sqlize_value(cls, value, to_json=False) -> str:
             return value.sql
         elif isinstance(value, (int, float, bool)):
             return f"{value}"
-        elif isinstance(value, (dict, list)):
+        elif isinstance(value, (dict, list, tuple)):
             dumped = dumps(value, ensure_ascii=False)
             if to_json:
                 return f"CAST('{dumped}' AS JSON)"
@@ -98,15 +98,17 @@ def upsert_on_duplicated(
         for d in dicts:
             values.append(f"({', '.join(cls._sqlize_value(d.get(f)) for f in insert_fields)})")
         # logger.debug(values)
+        new_table = f"`new_{table}`"
         upserts = []
         for field in upsert_fields:
-            upserts.append(f"{field}=VALUES({field})")
+            upserts.append(f"{field}={new_table}.{field}")
 
         sql = f"""
     INSERT INTO {table}
         ({", ".join(insert_fields)})
     VALUES
         {", ".join(values)}
+    AS {new_table}
     ON DUPLICATE KEY UPDATE {", ".join(upserts)}"""
         logger.debug(sql)
         return sql