velocity-python 0.0.163__tar.gz → 0.0.165__tar.gz

{velocity_python-0.0.163 → velocity_python-0.0.165}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.163
+Version: 0.0.165
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.0.163 → velocity_python-0.0.165}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "velocity-python"
-version = "0.0.163"
+version = "0.0.165"
 authors = [
   { name="Velocity Team", email="info@codeclubs.org" },
 ]

{velocity_python-0.0.163 → velocity_python-0.0.165}/src/velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.163"
+__version__ = version = "0.0.165"
 
 from . import aws
 from . import db

{velocity_python-0.0.163 → velocity_python-0.0.165}/src/velocity/db/servers/postgres/sql.py

@@ -439,12 +439,20 @@ class SQL(BaseSQLDialect):
             col_quoted = th.resolve_references(
                 col, options={"alias_column": False, "alias_table": False}
             )
+            is_special = isinstance(val, str) and val.startswith("@@") and val[2:]
             if excluded:
-                # For ON CONFLICT DO UPDATE statements, use the EXCLUDED value
-                set_clauses.append(f"{col_quoted} = EXCLUDED.{col_quoted}")
+                if is_special:
+                    # Allow callers to force literal expressions like CURRENT_TIMESTAMP
+                    set_clauses.append(f"{col_quoted} = {val[2:]}")
+                else:
+                    # For ON CONFLICT DO UPDATE statements, use the EXCLUDED value
+                    set_clauses.append(f"{col_quoted} = EXCLUDED.{col_quoted}")
             else:
-                set_clauses.append(f"{col_quoted} = %s")
-                vals.append(val)
+                if is_special:
+                    set_clauses.append(f"{col_quoted} = {val[2:]}")
+                else:
+                    set_clauses.append(f"{col_quoted} = %s")
+                    vals.append(val)
 
         # Build WHERE clauses for a normal update (ignored when excluded is True)
         where_clauses = []

{velocity_python-0.0.163 → velocity_python-0.0.165}/src/velocity/misc/merge.py

@@ -35,11 +35,18 @@ def deep_merge(*dicts: Dict[str, Any], update: bool = False) -> Dict[str, Any]:
             elif isinstance(d1[key], dict) and isinstance(value, dict):
                 d1[key] = merge_into(d1[key], value)
             elif isinstance(d1[key], list) and isinstance(value, list):
-                existing_items = set(d1[key])
-                d1[key].extend(x for x in value if x not in existing_items)
-                existing_items.update(
-                    value
-                )  # Keep the set updated for further iterations
+                try:
+                    existing_items = set(d1[key])
+                except TypeError:
+                    existing_items = None
+
+                if existing_items is None:
+                    for candidate in value:
+                        if all(candidate != current for current in d1[key]):
+                            d1[key].append(candidate)
+                else:
+                    d1[key].extend(x for x in value if x not in existing_items)
+                    existing_items.update(value)
             else:
                 d1[key] = deepcopy(value)  # Overwrite with the new value
         return d1

{velocity_python-0.0.163 → velocity_python-0.0.165}/src/velocity_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.163
+Version: 0.0.165
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT