fix: not enough values to unpack error (#2753)

This commit is contained in:
cthomas
2025-06-11 11:05:46 -07:00
committed by GitHub
parent d616a99916
commit f3bee4658c

View File

@@ -492,6 +492,8 @@ class SqlalchemyBase(CommonSqlalchemyMetaMixins, Base):
"""
identifiers = [] if identifier is None else [identifier]
query, query_conditions = cls._read_multiple_preprocess(identifiers, actor, access, access_type, check_is_deleted, **kwargs)
if query is None:
raise NoResultFound(f"{cls.__name__} not found with identifier {identifier}")
await db_session.execute(text("SET LOCAL enable_seqscan = OFF"))
try:
result = await db_session.execute(query)
@@ -528,6 +530,8 @@ class SqlalchemyBase(CommonSqlalchemyMetaMixins, Base):
NoResultFound: if the object is not found
"""
query, query_conditions = cls._read_multiple_preprocess(identifiers, actor, access, access_type, check_is_deleted, **kwargs)
if query is None:
return []
results = db_session.execute(query).scalars().all()
return cls._read_multiple_postprocess(results, identifiers, query_conditions)
@@ -548,6 +552,8 @@ class SqlalchemyBase(CommonSqlalchemyMetaMixins, Base):
The primary accessor for ORM record(s)
"""
query, query_conditions = cls._read_multiple_preprocess(identifiers, actor, access, access_type, check_is_deleted, **kwargs)
if query is None:
return []
results = await db_session.execute(query)
return cls._read_multiple_postprocess(results.scalars().all(), identifiers, query_conditions)
@@ -577,7 +583,7 @@ class SqlalchemyBase(CommonSqlalchemyMetaMixins, Base):
query_conditions.append(f"id='{identifiers}'")
elif not kwargs:
logger.debug(f"No identifiers provided for {cls.__name__}, returning empty list")
return []
return None, query_conditions
if kwargs:
query = query.filter_by(**kwargs)