tracktolib 0.59.0__tar.gz → 0.61.0__tar.gz

{tracktolib-0.59.0 → tracktolib-0.61.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tracktolib
-Version: 0.59.0
+Version: 0.61.0
 Summary: Utility library for python
 License: MIT
 License-File: LICENSE

{tracktolib-0.59.0 → tracktolib-0.61.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tracktolib"
-version = "0.59.0"
+version = "0.61.0"
 description = "Utility library for python"
 authors = ["Julien Brayere <julien.brayere@tracktor.fr>"]
 license = "MIT"
@@ -83,7 +83,7 @@ pythonPlatform = "Linux"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.59.0"
+version = "0.61.0"
 tag_format = "$version"
 version_files = [
     "pyproject.toml:version"

{tracktolib-0.59.0 → tracktolib-0.61.0}/tracktolib/pg/__init__.py

@@ -12,5 +12,6 @@ from .query import (
     update_one,
     insert_pg,
     OnConflict,
+    update_many,
 )
 from .utils import iterate_pg, upsert_csv, safe_pg, safe_pg_context, PGError, PGException

{tracktolib-0.59.0 → tracktolib-0.61.0}/tracktolib/pg/query.py

@@ -17,7 +17,7 @@ V = TypeVar("V")
 
 def _get_insert_query(table: str, columns: Iterable[K], values: str) -> str:
     _columns = ", ".join(columns)
-    return f"INSERT INTO {table} AS t ({_columns}) VALUES ( {values} )"
+    return f"INSERT INTO {table} AS t ({_columns}) VALUES ({values})"
 
 
 def _get_returning_query(query: str, returning: Iterable[K]) -> str:
@@ -217,7 +217,7 @@ def get_update_fields(
         fields.append(
             f"{_col} = ${_counter}"
             if k not in _merge_keys
-            else f"{_col} = COALESCE(t.{_col}, jsonb_build_object()) || " f"${_counter}"
+            else f"{_col} = COALESCE(t.{_col}, JSONB_BUILD_OBJECT()) || " f"${_counter}"
         )
         counter += 1
     return ",\n".join(fields), values + where_values
@@ -264,7 +264,7 @@ class PGUpdateQuery(PGQuery):
     def values(self):
         if not self._values:
             raise ValueError("No values found")
-        return self._values
+        return self._values if len(self.items) == 1 else super().values
 
     def _get_where_query(self) -> str:
         if self.where:
@@ -310,6 +310,10 @@ def insert_pg(
     )
 
 
+Q = TypeVar("Q", bound=PGInsertQuery | PGUpdateQuery)
+QueryCallback = Callable[[Q], None]
+
+
 async def insert_one(
     conn: _Connection,
     table: str,
@@ -318,8 +322,11 @@ async def insert_one(
     on_conflict: OnConflict | None = None,
     fill: bool = False,
     quote_columns: bool = False,
+    query_callback: QueryCallback[PGInsertQuery] | None = None,
 ):
     query = insert_pg(table=table, items=[item], on_conflict=on_conflict, fill=fill, quote_columns=quote_columns)
+    if query_callback is not None:
+        query_callback(query)
     await query.run(conn)
 
 
@@ -331,14 +338,23 @@ async def insert_many(
     on_conflict: OnConflict | None = None,
     fill: bool = False,
     quote_columns: bool = False,
+    query_callback: QueryCallback[PGInsertQuery] | None = None,
 ):
     query = insert_pg(table=table, items=items, on_conflict=on_conflict, fill=fill, quote_columns=quote_columns)
+    if query_callback is not None:
+        query_callback(query)
     await query.run(conn)
 
 
 @overload
 async def insert_returning(
-    conn: _Connection, table: str, item: dict, returning: str, on_conflict: OnConflict | None = None, fill: bool = False
+    conn: _Connection,
+    table: str,
+    item: dict,
+    returning: str,
+    on_conflict: OnConflict | None = None,
+    fill: bool = False,
+    query_callback: QueryCallback[PGInsertQuery] | None = None,
 ) -> Any | None: ...
 
 
@@ -350,6 +366,7 @@ async def insert_returning(
     returning: list[str],
     on_conflict: OnConflict | None = None,
     fill: bool = False,
+    query_callback: QueryCallback[PGInsertQuery] | None = None,
 ) -> asyncpg.Record | None: ...
 
 
@@ -360,9 +377,12 @@ async def insert_returning(
     returning: list[str] | str,
     on_conflict: OnConflict | None = None,
     fill: bool = False,
+    query_callback: QueryCallback[PGInsertQuery] | None = None,
 ) -> asyncpg.Record | Any | None:
     returning_values = [returning] if isinstance(returning, str) else returning
     query = insert_pg(table=table, items=[item], on_conflict=on_conflict, fill=fill, returning=returning_values)
+    if query_callback is not None:
+        query_callback(query)
     fn = conn.fetchval if len(returning_values) == 1 and returning != "*" else conn.fetchrow
 
     return await fn(query.query, *query.values)
@@ -389,10 +409,13 @@ async def update_one(
     start_from: int | None = None,
     where: str | None = None,
     merge_keys: list[str] | None = None,
+    query_callback: QueryCallback[PGUpdateQuery] | None = None,
 ):
     query = PGUpdateQuery(
         table=table, items=[item], start_from=start_from, where_keys=keys, where=where, merge_keys=merge_keys
     )
+    if query_callback is not None:
+        query_callback(query)
     await conn.execute(query.query, *args, *query.values)
 
 
@@ -408,6 +431,7 @@ async def update_returning(
     keys: list[str] | None = None,
     start_from: int | None = None,
     merge_keys: list[str] | None = None,
+    query_callback: QueryCallback[PGUpdateQuery] | None = None,
 ) -> Any | None: ...
 
 
@@ -423,6 +447,7 @@ async def update_returning(
     keys: list[str] | None = None,
     start_from: int | None = None,
     merge_keys: list[str] | None = None,
+    query_callback: QueryCallback[PGUpdateQuery] | None = None,
 ) -> asyncpg.Record | None: ...
 
 
@@ -438,6 +463,7 @@ async def update_returning(
     keys: list[str] | None = None,
     start_from: int | None = None,
     merge_keys: list[str] | None = None,
+    query_callback: QueryCallback[PGUpdateQuery] | None = None,
 ) -> asyncpg.Record | None: ...
 
 
@@ -452,6 +478,7 @@ async def update_returning(
     keys: list[str] | None = None,
     start_from: int | None = None,
     merge_keys: list[str] | None = None,
+    query_callback: QueryCallback[PGUpdateQuery] | None = None,
 ) -> Any | asyncpg.Record | None:
     if returning is not None:
         returning_values = [returning] if isinstance(returning, str) else returning
@@ -467,5 +494,25 @@ async def update_returning(
         returning=returning_values,
         merge_keys=merge_keys,
     )
+    if query_callback is not None:
+        query_callback(query)
     fn = conn.fetchval if len(returning_values or []) == 1 else conn.fetchrow
     return await fn(query.query, *args, *query.values)
+
+
+async def update_many(
+    conn: _Connection,
+    table: str,
+    items: list[dict],
+    keys: list[str] | None = None,
+    start_from: int | None = None,
+    where: str | None = None,
+    merge_keys: list[str] | None = None,
+    query_callback: QueryCallback[PGUpdateQuery] | None = None,
+):
+    query = PGUpdateQuery(
+        table=table, items=items, start_from=start_from, where_keys=keys, where=where, merge_keys=merge_keys
+    )
+    if query_callback is not None:
+        query_callback(query)
+    await conn.executemany(query.query, query.values)

{tracktolib-0.59.0 → tracktolib-0.61.0}/tracktolib/pg_utils.py

@@ -70,7 +70,7 @@ def get_conflict_query(
     fields = ", ".join(f"{x} = COALESCE(EXCLUDED.{x}, t.{x})" for x in columns if x not in _ignore_columns)
     if merge_columns:
         fields = fields + ", " if fields else fields
-        fields += ", ".join(f"{x} = COALESCE(t.{x}, jsonb_build_object()) || EXCLUDED.{x}" for x in merge_columns)
+        fields += ", ".join(f"{x} = COALESCE(t.{x}, JSONB_BUILD_OBJECT()) || EXCLUDED.{x}" for x in merge_columns)
     if not fields:
         raise ValueError("No fields set")