test: migrate test_remove_app_and_related_data_task to SQLAlchemy 2.0 select() API#34985
Merged
asukaminato0721 merged 1 commit intolanggenius:mainfrom Apr 12, 2026
Conversation
dosubot
Bot
added
the
size:XS
Contributor
Pyrefly DiffNo changes detected. |
Contributor
There was a problem hiding this comment.
Pull request overview
Migrates legacy session.query(...).count() assertions in the integration test suite to SQLAlchemy 2.0 select()-style count queries, aligning tests with the project’s ongoing ORM API modernization (#22668).
Changes:
- Replaced
session.query(...).filter_by(...).count()withsession.scalar(select(func.count()).select_from(...).filter_by(...)). - Replaced
session.query(...).where(...).count()withsession.scalar(select(func.count()).select_from(...).where(...)). - Added
func/selectimports needed for the new count queries.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
asukaminato0721
approved these changes
Apr 12, 2026
HanqingZ
pushed a commit
to HanqingZ/dify
that referenced
this pull request
Apr 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #22668
Summary
Migrates 25+ legacy
session.query()calls intests/integration_tests/tasks/test_remove_app_and_related_data_task.py. All occurrences are count assertions used to verify batch-deletion correctness:session.query(WorkflowDraftVariable).filter_by(app_id=...).count()→session.scalar(select(func.count()).select_from(WorkflowDraftVariable).filter_by(app_id=...))session.query(WorkflowDraftVariableFile).where(...).count()→session.scalar(select(func.count()).select_from(WorkflowDraftVariableFile).where(...))session.query(UploadFile).where(...).count()→session.scalar(select(func.count()).select_from(UploadFile).where(...))session.query(WorkflowDraftVariable).where(id.in_(...)).count()→ same pattern