plexus-python-common 1.0.68__tar.gz → 1.0.70__tar.gz

{plexus_python_common-1.0.68 → plexus_python_common-1.0.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexus-python-common
-Version: 1.0.68
+Version: 1.0.70
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{plexus_python_common-1.0.68 → plexus_python_common-1.0.70}/src/plexus/common/utils/ormutils.py

@@ -1092,12 +1092,12 @@ def db_read_sequence_models[SequenceModelT: SequenceModelMixin](
     limit: int | None = None,
     order_by: list[str] | None = None,
 ) -> list[SequenceModelT]:
-    query = db.query(model).order_by(*db_make_order_by_clause(model, order_by))
+    query_stmt = db.query(model).order_by(*db_make_order_by_clause(model, order_by))
     if skip is not None:
-        query = query.offset(skip)
+        query_stmt = query_stmt.offset(skip)
     if limit is not None:
-        query = query.limit(limit)
-    return query.all()
+        query_stmt = query_stmt.limit(limit)
+    return query_stmt.all()
 
 
 def db_update_sequence_model[SequenceModelT: SequenceModelMixin](
@@ -1285,7 +1285,7 @@ def db_read_latest_snapshot_models[SnapshotModelT: SnapshotModelMixin](
     limit: int | None = None,
     order_by: list[str] | None = None,
 ) -> list[SnapshotModelT]:
-    subquery = (
+    subquery_stmt = (
         db
         .query(model.record_sqn,
                sa.func.max(model.created_at).label("max_created_at"))
@@ -1293,18 +1293,19 @@ def db_read_latest_snapshot_models[SnapshotModelT: SnapshotModelMixin](
         .subquery()
     )
 
-    query = (
+    query_stmt = (
         db
         .query(model)
-        .join(subquery,
-              sa.and_(model.record_sqn == subquery.c.record_sqn, model.created_at == subquery.c.max_created_at))
+        .join(subquery_stmt,
+              sa.and_(model.record_sqn == subquery_stmt.c.record_sqn,
+                      model.created_at == subquery_stmt.c.max_created_at))
         .order_by(*db_make_order_by_clause(model, order_by))
     )
     if skip is not None:
-        query = query.offset(skip)
+        query_stmt = query_stmt.offset(skip)
     if limit is not None:
-        query = query.limit(limit)
-    return query.all()
+        query_stmt = query_stmt.limit(limit)
+    return query_stmt.all()
 
 
 def db_read_active_snapshot_models[SnapshotModelT: SnapshotModelMixin](
@@ -1314,12 +1315,12 @@ def db_read_active_snapshot_models[SnapshotModelT: SnapshotModelMixin](
     limit: int | None = None,
     order_by: list[str] | None = None,
 ) -> list[SnapshotModelT]:
-    query = db.query(model).where(model.expired_at.is_(None)).order_by(*db_make_order_by_clause(model, order_by))
+    query_stmt = db.query(model).where(model.expired_at.is_(None)).order_by(*db_make_order_by_clause(model, order_by))
     if skip is not None:
-        query = query.offset(skip)
+        query_stmt = query_stmt.offset(skip)
     if limit is not None:
-        query = query.limit(limit)
-    return query.all()
+        query_stmt = query_stmt.limit(limit)
+    return query_stmt.all()
 
 
 def db_update_snapshot_model[SnapshotModelT: SnapshotModelMixin](
@@ -1512,7 +1513,7 @@ def db_read_latest_revision_models[RevisionModelT: RevisionModelMixin](
     limit: int | None = None,
     order_by: list[str] | None = None,
 ) -> list[RevisionModelT]:
-    subquery = (
+    subquery_stmt = (
         db
         .query(model.record_sqn,
                sa.func.max(model.revision).label("max_revision"))
@@ -1520,18 +1521,19 @@ def db_read_latest_revision_models[RevisionModelT: RevisionModelMixin](
         .subquery()
     )
 
-    query = (
+    query_stmt = (
         db
         .query(model)
-        .join(subquery,
-              sa.and_(model.record_sqn == subquery.c.record_sqn, model.revision == subquery.c.max_revision))
+        .join(subquery_stmt,
+              sa.and_(model.record_sqn == subquery_stmt.c.record_sqn,
+                      model.revision == subquery_stmt.c.max_revision))
         .order_by(*db_make_order_by_clause(model, order_by))
     )
     if skip is not None:
-        query = query.offset(skip)
+        query_stmt = query_stmt.offset(skip)
     if limit is not None:
-        query = query.limit(limit)
-    return query.all()
+        query_stmt = query_stmt.limit(limit)
+    return query_stmt.all()
 
 
 def db_read_active_revision_models[RevisionModelT: RevisionModelMixin](
@@ -1541,12 +1543,12 @@ def db_read_active_revision_models[RevisionModelT: RevisionModelMixin](
     limit: int | None = None,
     order_by: list[str] | None = None,
 ) -> list[RevisionModelT]:
-    query = db.query(model).where(model.expired_at.is_(None)).order_by(*db_make_order_by_clause(model, order_by))
+    query_stmt = db.query(model).where(model.expired_at.is_(None)).order_by(*db_make_order_by_clause(model, order_by))
     if skip is not None:
-        query = query.offset(skip)
+        query_stmt = query_stmt.offset(skip)
     if limit is not None:
-        query = query.limit(limit)
-    return query.all()
+        query_stmt = query_stmt.limit(limit)
+    return query_stmt.all()
 
 
 def db_update_revision_model[RevisionModelT: RevisionModelMixin](