test: update TestContainers integration tests and unit test fixtures to SQLAlchemy 2.0 select() API (#34969)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
wdeveloper16 2026-04-12 03:24:14 +02:00 committed by GitHub
parent 7bd5e80323
commit 45561bed9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 14 deletions

View File

@ -557,11 +557,9 @@ class TestPauseStatePersistenceLayerTestContainers:
self.session.refresh(self.test_workflow_run) self.session.refresh(self.test_workflow_run)
assert self.test_workflow_run.status == WorkflowExecutionStatus.RUNNING assert self.test_workflow_run.status == WorkflowExecutionStatus.RUNNING
pause_states = ( pause_states = self.session.scalars(
self.session.query(WorkflowPauseModel) select(WorkflowPauseModel).where(WorkflowPauseModel.workflow_run_id == self.test_workflow_run_id)
.filter(WorkflowPauseModel.workflow_run_id == self.test_workflow_run_id) ).all()
.all()
)
assert len(pause_states) == 0 assert len(pause_states) == 0
def test_layer_requires_initialization(self, db_session_with_containers): def test_layer_requires_initialization(self, db_session_with_containers):

View File

@ -6,7 +6,7 @@ import pytest
import sqlalchemy as sa import sqlalchemy as sa
from graphon.model_runtime.entities.model_entities import ModelType from graphon.model_runtime.entities.model_entities import ModelType
from sqlalchemy import exc as sa_exc from sqlalchemy import exc as sa_exc
from sqlalchemy import insert from sqlalchemy import insert, select
from sqlalchemy.engine import Connection, Engine from sqlalchemy.engine import Connection, Engine
from sqlalchemy.orm import DeclarativeBase, Mapped, Session, mapped_column from sqlalchemy.orm import DeclarativeBase, Mapped, Session, mapped_column
from sqlalchemy.sql.sqltypes import VARCHAR from sqlalchemy.sql.sqltypes import VARCHAR
@ -137,12 +137,12 @@ class TestEnumText:
session.commit() session.commit()
with Session(engine_with_containers) as session: with Session(engine_with_containers) as session:
user = session.query(_User).where(_User.id == admin_user_id).first() user = session.scalar(select(_User).where(_User.id == admin_user_id).limit(1))
assert user.user_type == _UserType.admin assert user.user_type == _UserType.admin
assert user.user_type_nullable is None assert user.user_type_nullable is None
with Session(engine_with_containers) as session: with Session(engine_with_containers) as session:
user = session.query(_User).where(_User.id == normal_user_id).first() user = session.scalar(select(_User).where(_User.id == normal_user_id).limit(1))
assert user.user_type == _UserType.normal assert user.user_type == _UserType.normal
assert user.user_type_nullable == _UserType.normal assert user.user_type_nullable == _UserType.normal
@ -206,7 +206,7 @@ class TestEnumText:
with pytest.raises(ValueError) as exc: with pytest.raises(ValueError) as exc:
with Session(engine_with_containers) as session: with Session(engine_with_containers) as session:
_user = session.query(_User).where(_User.id == 1).first() _user = session.scalar(select(_User).where(_User.id == 1).limit(1))
assert str(exc.value) == "'invalid' is not a valid _UserType" assert str(exc.value) == "'invalid' is not a valid _UserType"
@ -222,7 +222,7 @@ class TestEnumText:
session.commit() session.commit()
with Session(engine_with_containers) as session: with Session(engine_with_containers) as session:
records = session.query(_LegacyModelTypeRecord).order_by(_LegacyModelTypeRecord.id).all() records = session.scalars(select(_LegacyModelTypeRecord).order_by(_LegacyModelTypeRecord.id)).all()
assert [record.model_type for record in records] == [ assert [record.model_type for record in records] == [
ModelType.LLM, ModelType.LLM,

View File

@ -26,7 +26,7 @@ from datetime import timedelta
import pytest import pytest
from graphon.entities import WorkflowExecution from graphon.entities import WorkflowExecution
from graphon.enums import WorkflowExecutionStatus from graphon.enums import WorkflowExecutionStatus
from sqlalchemy import delete, select from sqlalchemy import delete, func, select
from sqlalchemy.orm import Session, selectinload, sessionmaker from sqlalchemy.orm import Session, selectinload, sessionmaker
from extensions.ext_storage import storage from extensions.ext_storage import storage
@ -679,9 +679,12 @@ class TestWorkflowPauseIntegration:
# Verify only 3 were deleted # Verify only 3 were deleted
remaining_count = ( remaining_count = (
self.session.query(WorkflowPauseModel) self.session.scalar(
.filter(WorkflowPauseModel.id.in_([pe.id for pe in pause_entities])) select(func.count(WorkflowPauseModel.id)).where(
.count() WorkflowPauseModel.id.in_([pe.id for pe in pause_entities])
)
)
or 0
) )
assert remaining_count == 2 assert remaining_count == 2