tracktolib 0.49.0__py3-none-any.whl → 0.50.0__py3-none-any.whl

tracktolib/pg/__init__.py

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

tracktolib/pg/query.py

@@ -1,6 +1,7 @@
 import typing
 from dataclasses import dataclass, field
 from typing import TypeVar, Iterable, Callable, Generic, Iterator, TypeAlias, overload, Any, Literal
+
 from ..pg_utils import get_conflict_query
 
 try:
@@ -32,6 +33,7 @@ def _get_on_conflict_query(
     constraint: K | None,
     on_conflict: K | None,
     where: K | None,
+    merge_columns: Iterable[K] | None,
 ) -> str:
     _on_conflict = get_conflict_query(
         columns=columns,
@@ -40,6 +42,7 @@ def _get_on_conflict_query(
         constraint=constraint,
         on_conflict=on_conflict,
         where=where,
+        merge_columns=merge_columns,
     )
     return f"{query} {_on_conflict}"
 
@@ -72,6 +75,7 @@ class PGConflictQuery(Generic[K]):
     query: str | None = None
     constraint: str | None = None
     where: str | None = None
+    merge_keys: Iterable[K] | None = None
 
     def __post_init__(self):
         _has_keys = 1 if (self.keys or self.ignore_keys) else 0
@@ -172,6 +176,7 @@ class PGInsertQuery(PGQuery):
                 self.on_conflict.constraint,
                 self.on_conflict.query,
                 self.on_conflict.where,
+                self.on_conflict.merge_keys,
             )
 
         # Returning

tracktolib/pg_sync.py

@@ -18,6 +18,7 @@ from .pg_utils import get_tmp_table_query
 def fetch_all(engine: Connection, query: LiteralString, *data) -> list[dict]:
     with engine.cursor(row_factory=dict_row) as cur:
         resp = (cur.execute(query) if not data else cur.execute(query, data)).fetchall()
+    engine.commit()
     return resp
 
 
@@ -27,7 +28,7 @@ def fetch_count(engine: Connection, table: str, *args, where: str | None = None)
         query = f"{query} WHERE {where}"
     with engine.cursor() as cur:
         count = cur.execute(cast(LiteralString, query), params=args).fetchone()
-
+    engine.commit()
     return count[0] if count else None
 
 
@@ -46,6 +47,7 @@ def fetch_one(engine: Connection, query: Query, *args) -> dict | None: ...
 def fetch_one(engine: Connection, query: Query, *args, required: bool = False) -> dict | None:
     with engine.cursor(row_factory=dict_row) as cur:
         _data = cur.execute(query, args).fetchone()
+    engine.commit()
     if required and not _data:
         raise ValueError("No value found for query")
     return _data

tracktolib/pg_utils.py

@@ -1,7 +1,8 @@
-from typing_extensions import LiteralString
 from typing import Iterable
 from typing import cast
 
+from typing_extensions import LiteralString
+
 
 def get_tmp_table_query(
     schema: LiteralString,
@@ -41,6 +42,7 @@ def get_conflict_query(
     constraint: str | None = None,
     on_conflict: str | None = None,
     where: str | None = None,
+    merge_columns: Iterable[str] | None = None,
 ) -> LiteralString:
     if on_conflict:
         return cast(LiteralString, on_conflict)
@@ -55,8 +57,19 @@ def get_conflict_query(
     else:
         raise NotImplementedError("update_keys or constraint must be set")
 
-    _ignore_columns = [*(update_columns or []), *(ignore_columns or [])]
+    _update_columns = update_columns or []
+    _ignore_columns = ignore_columns or []
+    _merge_columns = merge_columns or []
+
+    if set(_merge_columns) & set(_update_columns):
+        raise ValueError("Duplicate keys found between merge and update")
+    if set(_merge_columns) & set(_ignore_columns):
+        raise ValueError("Merge column cannot be ignored")
+
+    _ignore_columns = [*_update_columns, *_ignore_columns, *_merge_columns]
     fields = ", ".join(f"{x} = COALESCE(EXCLUDED.{x}, t.{x})" for x in columns if x not in _ignore_columns)
+    if 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")
 

{tracktolib-0.49.0.dist-info → tracktolib-0.50.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tracktolib
-Version: 0.49.0
+Version: 0.50.0
 Summary: Utility library for python
 Home-page: https://github.com/tracktor/tracktolib
 License: MIT

{tracktolib-0.49.0.dist-info → tracktolib-0.50.0.dist-info}/RECORD

@@ -3,17 +3,17 @@ tracktolib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tracktolib/api.py,sha256=xArVgRj_g7bw2tEDbjC9qs9f55b9X0-kJoc8-s1rsYo,9616
 tracktolib/http_utils.py,sha256=c10JGmHaBw3VSDMYhz2dvVw2lo4PUAq1xMub74I7xDc,2625
 tracktolib/logs.py,sha256=M5RZ8OYKgLEBJeC1AwUCSRbFAH09hwdTjjs-AQ9QGg8,2204
-tracktolib/pg/__init__.py,sha256=32kKBJzIDyppszZMAOSMgM3ggz7Ow0TaNKiMs740gyw,333
-tracktolib/pg/query.py,sha256=KESY4g0XePUrRIakygmzhPP2vIOfJGWc2PAZsIj_PfI,13580
+tracktolib/pg/__init__.py,sha256=j67e3B3gBbCHLD20QBybptmNdbbVMzNhZE6XjIPuKVo,349
+tracktolib/pg/query.py,sha256=otLukOink4qQDUAN2VaPvlq5Ig8Sz7yfQlg-8gjI4iY,13744
 tracktolib/pg/utils.py,sha256=cL24KEt4SWJQ7LJPzaO3c8Xg0ZLmjhn22DtTWg86nwc,6324
-tracktolib/pg_sync.py,sha256=OsmEbFzqlJDm1jfuxpFi2Lhjj9nEGxGlnNmZCnqWZ6c,5106
-tracktolib/pg_utils.py,sha256=8DDlZVSgfNie9M-zL7wilFufXMMvSPw5d7aIDs_pQCM,1976
+tracktolib/pg_sync.py,sha256=z6EB0hELq6t129gnVnX0rNXv2McZXxI8khy-TEG65Ag,5165
+tracktolib/pg_utils.py,sha256=asFAyTC_RCRaYr9fiJxTiSs3yxZM6xyoOKLA6olg6yg,2529
 tracktolib/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tracktolib/s3/minio.py,sha256=wMEjkSes9Fp39fD17IctALpD6zB2xwDRQEmO7Vzan3g,1387
 tracktolib/s3/s3.py,sha256=d0Q63Zb62ef4jAt05zQwpgYvAoxHC9kSQuHzzK90VvE,4825
 tracktolib/tests.py,sha256=Pbc4yGQrIWFLBEgX-kDBxhMCqH-bfOJtkH2agvaM6ZQ,382
 tracktolib/utils.py,sha256=jwLww8bqDu8zEip9uN4yW0lE5_YMWfrAHYtagr8sYOA,5295
-tracktolib-0.49.0.dist-info/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
-tracktolib-0.49.0.dist-info/METADATA,sha256=jwSGn-VdiGimYNLizSMhI_cLSyM8GgQDNkickFcfJ-4,3641
-tracktolib-0.49.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-tracktolib-0.49.0.dist-info/RECORD,,
+tracktolib-0.50.0.dist-info/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
+tracktolib-0.50.0.dist-info/METADATA,sha256=MbyudDqUlbPAKAomAy94zIDnKTnhKPnvxSzI9VUQU2s,3641
+tracktolib-0.50.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+tracktolib-0.50.0.dist-info/RECORD,,