tracktolib 0.61.0__py3-none-any.whl → 0.61.2__py3-none-any.whl

tracktolib/pg/query.py

@@ -105,8 +105,8 @@ class PGQuery(Generic[K, V]):
     def columns(self):
         return [f'"{x}"' for x in self.keys] if self.quote_columns else self.keys
 
-    def iter_values(self) -> Iterator[tuple]:
-        _keys = self.keys
+    def iter_values(self, keys: list[K] | None = None) -> Iterator[tuple]:
+        _keys = keys if keys is not None else self.keys
         for _item in self.items:
             yield tuple(_item[k] for k in _keys)
 
@@ -264,13 +264,18 @@ class PGUpdateQuery(PGQuery):
     def values(self):
         if not self._values:
             raise ValueError("No values found")
-        return self._values if len(self.items) == 1 else super().values
+        if len(self.items) == 1:
+            return self._values
+        _where_keys = self.where_keys or []
+        _keys_not_where = [k for k in self.keys if k not in _where_keys]
+        values = list(self.iter_values(keys=_keys_not_where + _where_keys))
+        return values
 
     def _get_where_query(self) -> str:
         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 ""

{tracktolib-0.61.0.dist-info → tracktolib-0.61.2.dist-info}/METADATA

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

{tracktolib-0.61.0.dist-info → tracktolib-0.61.2.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=dsLvDrLEh1X7sPvWS1onX9NyZPOCoDCfCfttT4z7ndU,16180
+tracktolib/pg/query.py,sha256=_Rx_VdG7KDM6HDswxT80DYBbvrSiaXq25QPB3hIZXvw,16445
 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.61.0.dist-info/METADATA,sha256=H29GtEERzSypHNh6AOMegIPgDqBTlE4XboYuknd0ulk,3777
-tracktolib-0.61.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-tracktolib-0.61.0.dist-info/licenses/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
-tracktolib-0.61.0.dist-info/RECORD,,
+tracktolib-0.61.2.dist-info/METADATA,sha256=l7TYZ2iOLimA-mE-Q56VQMIqy6URHTEMxT_19VJUjQg,3777
+tracktolib-0.61.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+tracktolib-0.61.2.dist-info/licenses/LICENSE,sha256=uUanH0X7SeZEPdsRTHegMSMTiIHMurt9H0jSwEwKE1Y,1081
+tracktolib-0.61.2.dist-info/RECORD,,