tracktolib 0.49.1__tar.gz → 0.50.0__tar.gz

{tracktolib-0.49.1 → tracktolib-0.50.0}/PKG-INFO

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

{tracktolib-0.49.1 → tracktolib-0.50.0}/pyproject.toml

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

{tracktolib-0.49.1 → tracktolib-0.50.0}/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-0.49.1 → tracktolib-0.50.0}/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-0.49.1 → tracktolib-0.50.0}/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")