feat: add param merge_fields to bulk_update_from_dicts

Author: NightMarcher

examples/service/routers/account.py

@@ -192,6 +192,7 @@ class UpdateIn(BaseModel):
     id: int = Field(...)
     active: bool = Field(...)
     gender: GenderEnum = Field(...)
+    extend: dict
 
 @router.post("/bulk_update")
 async def bulk_update_view(
@@ -201,6 +202,7 @@ async def bulk_update_view(
         [d.dict() for d in dicts],
         join_fields=["id"],
         update_fields=["active", "gender"],
+        merge_fields=["extend"],
         using_values=True,
     )
     return {"row_cnt": row_cnt}

fastapi_esql/orm/base_manager.py

@@ -185,13 +185,15 @@ async def bulk_update_from_dicts(
         dicts: List[Dict[str, Any]],
         join_fields: List[str],
         update_fields: List[str],
+        merge_fields: Optional[List[str]] = None,
         using_values: bool = True,
     ):
         sql = SQLizer.bulk_update_from_dicts(
             cls.table,
             dicts,
             join_fields,
             update_fields,
+            merge_fields,
             using_values,
         )
         return await CursorHandler.sum_row_cnt(sql, cls.rw_conn, logger)

fastapi_esql/utils/sqlizer.py

@@ -268,6 +268,7 @@ def build_fly_table(
         dicts: List[Dict[str, Any]],
         fields: List[str],
         using_values: bool = True,
+        log_sql: bool = True,
     ) -> Optional[str]:
         if not all([dicts, fields]):
             raise WrongParamsError("Parameters `dicts`, `fields` are required")
@@ -291,7 +292,8 @@ def build_fly_table(
         SELECT * FROM (
           {values}
         ) AS {table}"""
-        logger.debug(sql)
+        if log_sql:
+            logger.debug(sql)
         return sql
 
     @classmethod
@@ -301,17 +303,22 @@ def bulk_update_from_dicts(
         dicts: List[Dict[str, Any]],
         join_fields: List[str],
         update_fields: List[str],
+        merge_fields: Optional[List[str]] = None,
         using_values: bool = True,
     ) -> Optional[str]:
         if not all([table, dicts, join_fields, update_fields]):
             raise WrongParamsError("Parameters `table`, `dicts`, `join_fields`, `update_fields` are required")
 
         joins = [f"{table}.{jf}=tmp.{jf}" for jf in join_fields]
         updates = [f"{table}.{uf}=tmp.{uf}" for uf in update_fields]
+        merge_fields = merge_fields or []
+        for mf in merge_fields:
+            dict_obj = f"COALESCE({table}.{mf}, '{{}}')"
+            updates.append(f"{table}.{mf}=JSON_MERGE_PATCH({dict_obj}, tmp.{mf})")
 
         sql = f"""
     UPDATE {table}
-    JOIN ({SQLizer.build_fly_table(dicts, join_fields + update_fields, using_values)}
+    JOIN ({SQLizer.build_fly_table(dicts, join_fields + update_fields + merge_fields, using_values, log_sql=False)}
     ) tmp ON {", ".join(joins)}
     SET {", ".join(updates)}
 """