tracktolib 0.60.0__py3-none-any.whl → 0.61.1__py3-none-any.whl

tracktolib/pg/query.py

@@ -270,7 +270,7 @@ class PGUpdateQuery(PGQuery):
         if self.where:
             return self.where
         elif self.where_keys is not None:
-            start_from = self.start_from if self.start_from is not None else len(self.values) - len(self.where_keys)
+            start_from = self.start_from if self.start_from is not None else len(self.keys) - len(self.where_keys)
 
             return "WHERE " + " AND ".join(f"{k} = ${i + start_from + 1}" for i, k in enumerate(self.where_keys))
         return ""
@@ -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,6 +494,8 @@ 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)
 
@@ -479,8 +508,11 @@ async def update_many(
     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.60.0.dist-info → tracktolib-0.61.1.dist-info}/METADATA

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

{tracktolib-0.60.0.dist-info → tracktolib-0.61.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ tracktolib/api.py,sha256=ZLMgjH3Y8r3MpXc8m3IuZbzTj3fgrZKZORtSVgbuP-M,10221
 tracktolib/http_utils.py,sha256=c10JGmHaBw3VSDMYhz2dvVw2lo4PUAq1xMub74I7xDc,2625
 tracktolib/logs.py,sha256=xgfRDnviZPr9qinSOgab8neIWPv9Rj2xzDHnIBvWQcU,2201
 tracktolib/pg/__init__.py,sha256=Ul_hgwvTXZvQBt7sHKi4ZI-0DDpnXmoFtmVkGRy-1J0,366
-tracktolib/pg/query.py,sha256=PQ-vMTwsdvGpM82oE6moHVfD6eta61yPgB7IYRU8CVU,14973
+tracktolib/pg/query.py,sha256=Gfrv_XWS3HVjobh4rjNf4o5Pn5-0YP0AZa3vA-4GBsI,16178
 tracktolib/pg/utils.py,sha256=cL24KEt4SWJQ7LJPzaO3c8Xg0ZLmjhn22DtTWg86nwc,6324
 tracktolib/pg_sync.py,sha256=MKDaV7dYsRy59Y0EE5RGZL0DlZ-RUdBeaN9eSBwiQJg,6718
 tracktolib/pg_utils.py,sha256=ArYNdf9qsdYdzGEWmev8tZpyx8_1jaGGdkfYkauM7UM,2582
@@ -12,7 +12,7 @@ tracktolib/s3/minio.py,sha256=wMEjkSes9Fp39fD17IctALpD6zB2xwDRQEmO7Vzan3g,1387
 tracktolib/s3/s3.py,sha256=0HbSAPoaup5-W4LK54zRCjrQ5mr8OWR-N9WjW99Q4aw,5937
 tracktolib/tests.py,sha256=gKE--epQjgMZGXc5ydbl4zjOdmwztJS42UMV0p4hXEA,399
 tracktolib/utils.py,sha256=ysTBF9V35fVXQVBPk0kfE_84SGRxzrayqmg9RbtoJq4,5761
-tracktolib-0.60.0.dist-info/METADATA,sha256=1qNZSiff8zDxWsmA-lgHQ45EnBufiABtkMy6EK4KNbM,3777
-tracktolib-0.60.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-tracktolib-0.60.0.dist-info/licenses/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
-tracktolib-0.60.0.dist-info/RECORD,,
+tracktolib-0.61.1.dist-info/METADATA,sha256=do6v8-tZbQ1nYmofQiycwSbpDWeMw5DQUvwUFZShbj8,3777
+tracktolib-0.61.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+tracktolib-0.61.1.dist-info/licenses/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
+tracktolib-0.61.1.dist-info/RECORD,,