feat: add new param assign_field_dict to update_json_field

Author: NightMarcher

README.md

@@ -106,12 +106,17 @@ await AccountMgr.update_json_field(
     },
     remove_paths=["$.deprecated"],
     json_type=dict,
+    assign_field_dict={
+        "active": True,
+        "name": "new_name",
+    },
 )
 ```
 Generate sql and execute
 ```sql
     UPDATE `account` SET extend =
     JSON_MERGE_PATCH(JSON_SET(JSON_REMOVE(COALESCE(extend, '{}'), '$.deprecated'), '$.last_login',CAST('{"ipv4": "209.182.101.161"}' AS JSON), '$.uuid','fd04f7f2-24fc-4a73-a1d7-b6e99a464c5f'), '{"updated_at": "2022-10-30 21:34:15", "info": {"online_sec": 636}}')
+    , active=True, name='new_name'
     WHERE `id`=8
 ```
 

fastapi_esql/orm/base_manager.py

@@ -133,6 +133,7 @@ async def update_json_field(
         path_value_dict: Optional[Dict[str, Any]] = None,
         remove_paths: Optional[List[str]] = None,
         json_type: type = dict,
+        assign_field_dict: Dict[str, Any] = None,
     ):
         sql = SQLizer.update_json_field(
             cls.table,
@@ -142,6 +143,7 @@ async def update_json_field(
             path_value_dict=path_value_dict,
             remove_paths=remove_paths,
             json_type=json_type,
+            assign_field_dict=assign_field_dict,
             model=cls.model,
         )
         return await CursorHandler.sum_row_cnt(sql, cls.rw_conn, logger)

fastapi_esql/utils/sqlizer.py

@@ -162,6 +162,7 @@ def update_json_field(
         path_value_dict: Optional[Dict[str, Any]] = None,
         remove_paths: Optional[List[str]] = None,
         json_type: type = dict,
+        assign_field_dict: Dict[str, Any] = None,
         model: Optional[Model] = None,
     ) -> Optional[str]:
         if not all([table, json_field, wheres]):
@@ -184,11 +185,23 @@ def update_json_field(
         if merge_dict:
             json_obj = f"JSON_MERGE_PATCH({json_obj}, {cls.sqlize_value(merge_dict)})"
 
-        sql = f"""
-    UPDATE {wrap_backticks(table)} SET {json_field} =
-    {json_obj}
-    WHERE {cls.resolve_wheres(wheres, model)}
-"""
+        assign_field_dict = assign_field_dict or {}
+        assign_fields = []
+        for k, v in assign_field_dict.items():
+            assign_fields.append(f"{k}={cls.sqlize_value(v)}")
+        assign_field = ", ".join(assign_fields) if assign_fields else None
+
+        sql = """
+    UPDATE {} SET {} =
+    {}{}
+    WHERE {}
+""".format(
+        wrap_backticks(table),
+        json_field,
+        json_obj,
+        "\n    , " + assign_field if assign_field else "",
+        cls.resolve_wheres(wheres, model),
+    )
         logger.debug(sql)
         return sql
 

tests/test_sqlizer.py

@@ -200,6 +200,37 @@ def test_update_json_field(self):
     WHERE `id`=8
 """
 
+        sql = SQLizer.update_json_field(
+            self.table,
+            json_field="extend",
+            wheres=Q(id=8),
+            merge_dict={
+                "updated_at": "2022-10-30 21:34:15",
+                "info": {
+                    "online_sec": 636,
+                }
+            },
+            path_value_dict={
+                "$.last_login": {
+                    "ipv4": "209.182.101.161",
+                },
+                "$.uuid": "fd04f7f2-24fc-4a73-a1d7-b6e99a464c5f",
+            },
+            remove_paths=["$.deprecated"],
+            json_type=dict,
+            assign_field_dict={
+                "active": True,
+                "name": "new_name",
+            },
+            model=self.model,
+        )
+        assert sql == """
+    UPDATE `account` SET extend =
+    JSON_MERGE_PATCH(JSON_SET(JSON_REMOVE(COALESCE(extend, '{}'), '$.deprecated'), '$.last_login',CAST('{"ipv4": "209.182.101.161"}' AS JSON), '$.uuid','fd04f7f2-24fc-4a73-a1d7-b6e99a464c5f'), '{"updated_at": "2022-10-30 21:34:15", "info": {"online_sec": 636}}')
+    , active=True, name='new_name'
+    WHERE `id`=8
+"""
+
     def test_upsert_on_duplicate(self):
         with self.assertRaises(WrongParamsError):
             SQLizer.upsert_on_duplicate(