macrostrat.database 4.0.1__tar.gz → 4.0.2__tar.gz

{macrostrat_database-4.0.1 → macrostrat_database-4.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: macrostrat.database
-Version: 4.0.1
+Version: 4.0.2
 Summary: A SQLAlchemy-based database toolkit.
 Author: Daven Quinn
 Author-email: Daven Quinn <dev@davenquinn.com>

{macrostrat_database-4.0.1 → macrostrat_database-4.0.2}/macrostrat/database/postgresql.py

@@ -72,25 +72,33 @@ def prefix_inserts(insert, compiler, **kw):
 def upsert(
     table,
     values: dict[str, Any],
-    index_elements: Sequence[str],
     *,
-    on_conflict: OnConflictAction = "do-update",
+    index_elements: Sequence[str] | None = None,
+    on_conflict: OnConflictAction = OnConflictAction.DO_UPDATE,
 ):
+    _index = index_elements
     stmt = postgresql.insert(table).values(values)
     if on_conflict == "restrict":
         return stmt
 
     if on_conflict == "do-nothing":
-        return stmt.on_conflict_do_nothing(index_elements=list(index_elements))
+        return stmt.on_conflict_do_nothing(index_elements=_index)
+
+    if _index is None:
+        _index = table.primary_key.columns.keys()
+    _index = list(_index)
 
     update_values = {
         column.name: getattr(stmt.excluded, column.name)
         for column in table.columns
-        if column.name in values and column.name not in index_elements
+        if column.name not in _index
     }
 
+    if len(update_values) == 0:
+        return stmt
+
     return stmt.on_conflict_do_update(
-        index_elements=list(index_elements),
+        index_elements=_index,
         set_=update_values,
     )
 

{macrostrat_database-4.0.1 → macrostrat_database-4.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "macrostrat.database"
-version = "4.0.1"
+version = "4.0.2"
 description = "A SQLAlchemy-based database toolkit."
 authors = [{ name = "Daven Quinn", email = "dev@davenquinn.com" }]
 requires-python = ">=3.10,<4"