From 94837e1b6f5714a17679c3d90999df14a40b9c1a Mon Sep 17 00:00:00 2001 From: Yaro Kasear Date: Wed, 24 Sep 2025 08:42:40 -0500 Subject: [PATCH] Minor tweaks. --- crudkit/core/service.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crudkit/core/service.py b/crudkit/core/service.py index b13bb81..7c40320 100644 --- a/crudkit/core/service.py +++ b/crudkit/core/service.py @@ -1,7 +1,7 @@ from typing import Any, Callable, Type, TypeVar, Generic, Optional, Protocol, runtime_checkable, cast from sqlalchemy import and_, func, inspect, or_, text from sqlalchemy.engine import Engine, Connection -from sqlalchemy.orm import Load, Session, selectinload, with_polymorphic, Mapper, RelationshipProperty, ColumnProperty +from sqlalchemy.orm import Load, Session, with_polymorphic, Mapper, RelationshipProperty from sqlalchemy.orm.attributes import InstrumentedAttribute from crudkit.core.base import Version @@ -232,7 +232,7 @@ class CRUDService(Generic[T]): total = None if include_total: base = self.session.query(getattr(root_alias, "id")) - if self.supports_soft_delete and not _is_truthy(params.get("include_deleted")): + if self.supports_soft_delete and not _is_truthy((params or {}).get("include_deleted")): base = base.filter(getattr(root_alias, "is_deleted") == False) if filters: base = base.filter(*filters) @@ -279,7 +279,7 @@ class CRUDService(Generic[T]): for col in mapper.primary_key: try: pk_cols.append(getattr(root_alias, col.key)) - except ArithmeticError: + except AttributeError: pk_cols.append(col) return [*order_by, *pk_cols]