fix(queryset): use subquery for DELETE/UPDATE filtering by related fields by noy-solvin · Pull Request #2139 · tortoise/tortoise-orm

noy-solvin · 2026-03-11T16:04:21Z

Description

Modified DeleteQuery._make_query() and UpdateQuery._make_query() in tortoise/queryset.py to use a subquery pattern - WHERE id IN (SELECT id FROM (SELECT id FROM table JOIN ... WHERE ...) AS _t).
Also preserved LIMIT and ORDER BY clauses within the internal subquery.

Motivation and Context

DELETE and UPDATE queries were failing when filtering by related fields (foreign keys) because the engine was trying to use JOINs, which MySQL and SQLite don't support for these operations.
closes #283

How Has This Been Tested?

Added test_delete_filter_with_foreign_key and test_update_filter_with_foreign_key to the test suite.
Verified that the full regression suite (1899 tests) passes. The fix was also tested manually.

Full transparency: this fix was generated using Solvin, an AI coding agent my team is building. Reviewed and tested manually before submitting. I'd love your feedback. The fix was fully tested manually by me prior to submitting this PR.

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have added the changelog accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.

…elds

codspeed-hq · 2026-03-12T05:38:11Z

Merging this PR will not alter performance

✅ 24 untouched benchmarks

_{Comparing noy-solvin:fix/queryset (4727f84) with develop (4aa3790)}

themavik

Reviewed the changes — the implementation is clean and follows the existing patterns.

…e filters

noy-solvin · 2026-06-16T11:11:42Z

🔍 The Problem

The test cases test_delete_filter_with_foreign_key and test_update_filter_with_foreign_key in tests/test_queryset.py lacked negative control records. Without these negative controls, the tests were unable to verify that delete and update operations only affect target records, leaving other database entries unaffected.

🛠️ The Solution

Added author2 and book3 as negative control records in test_delete_filter_with_foreign_key to verify that deleting books by one author does not affect books belonging to other authors.
Modified the assertions in test_delete_filter_with_foreign_key to verify that exactly one book remains in the database after deletion.
Added author2 and book2 as negative control records in test_update_filter_with_foreign_key to verify that updating books by one author does not modify the ratings of other books.
Modified the assertions in test_update_filter_with_foreign_key to check that the targeted book rating was updated to 1.0 while the control book rating remained untouched at 5.0.

🟢 Confidence: High

📊 Solvin Autonomous Verification Matrix

Engineering Dimension	Status / Score	Technical Telemetry
🎯 Intent Clarity	🟢 High	The input issue description clearly defines the missing negative controls and specifies the exact functions in tests/test_queryset.py.
🔍 RCA Confidence	🟢 High	Root cause isolated with high confidence to missing negative control records in foreign key delete and update test cases.
🛠️ Execution Safety	🟢 High	Compiler safety and execution of unit and full regression test suites passed successfully with zero errors.
🗺️ Code Blast Radius	🟢 Low (Indicates high containment / safe footprint)	The change footprint is extremely small and isolated entirely within unit tests, resulting in zero blast radius.
🧠 Fact & Logic Grounding	🟢 High	LLM Judge audit verified complete grounding with zero hallucinations across all execution records.

The overall confidence is High as the changes are extremely well-defined and fully verified. The Code Blast Radius is Low because the changes are entirely isolated within test cases and do not affect the core application codebase.

✅ Verification

Executed unit tests specifically for tests/test_queryset.py under Unit mode, with all 73 tests (65 passed, 8 skipped, 0 failed) passing successfully.
Executed full regression testing check, confirming that all 1936 tests passed with zero compilation errors, zero suite errors, and zero regressions.
Solvin completed architectural and code reviews confirming that the updated tests follow best practices and do not violate any design patterns.
A security regression scan confirmed the new code has no security issue.

noy-solvin · 2026-06-23T07:29:37Z

Hi @waketzheng
Would love you feedback!
Thank you

noy-solvin · 2026-06-25T11:10:53Z

Thanks @waketzheng for reviewing! I made the necessary change.

noy-solvin · 2026-08-09T07:43:56Z

Hi @waketzheng, I would love your feedback.
Thanks!

waketzheng · 2026-08-09T09:25:33Z

@noy-solvin, could you merge upstream/develop again?

waketzheng · 2026-08-09T09:46:56Z

Additionally, please take a look at abondar's review comment. Also, after adding your code, the _make_query function has become a bit too long — as a rule, a function should not exceed one screen in length.

noy-solvin · 2026-08-11T11:06:22Z

Thanks for the reply. I have addressed the issues :) @waketzheng

waketzheng · 2026-08-23T16:13:06Z

+    author2 = await Author.create(name="test2")
+    await Book.create(name="book3", author=author2, rating=5.0)
+
+    # This is the failing query


Please remove this comment line.

waketzheng · 2026-08-23T16:16:37Z

+
+Added
+^^^^^
+- Tests for model validators. (#2137)


Please remove this, as it is unrelated to this PR.

waketzheng · 2026-08-23T16:44:54Z

+
+
+def test_update_query_postgres_dialect_coverage(db):
+    from tortoise.backends.base.client import Capabilities


It doesn't need to be inside a function — please move it to the top of the file.

waketzheng · 2026-08-23T16:45:34Z

+
+
+def test_delete_query_postgres_dialect_coverage(db):
+    from tortoise.backends.base.client import Capabilities


Also move it to the top.

waketzheng · 2026-08-23T17:00:40Z

+
+
+@pytest.mark.asyncio
+async def test_delete_limit_order_by_with_join(db):


Are this test and the one above related to this PR? If not, please move them to a separate PR. If they are related, please use a TestClass to reduce duplicated code.

solvin-ai-teammate and others added 2 commits March 11, 2026 12:15

fix(queryset): use subquery for DELETE/UPDATE filtering by related fi…

80c15af

…elds

update changelog

fc545b7

style: fix formatting

b453065

noy-solvin mentioned this pull request Mar 15, 2026

Delete with related field query fails due to invalid SQL generation #283

Open

abondar reviewed Mar 15, 2026

View reviewed changes

Comment thread tortoise/queryset.py Outdated

Comment thread tortoise/queryset.py Outdated

Comment thread tests/test_queryset.py

themavik reviewed Mar 19, 2026

View reviewed changes

abondar mentioned this pull request Mar 19, 2026

fix: use subquery for DELETE with JOINs on SQLite/PostgreSQL #2151

Closed

Merge branch 'develop' into fix/queryset

bad1907

waketzheng requested changes May 17, 2026

View reviewed changes

Comment thread tests/test_queryset.py

Comment thread tests/test_queryset.py

waketzheng added the Waiting for feedback label Jun 11, 2026

noy-solvin added 4 commits June 16, 2026 13:43

test(queryset): add negative controls in foreign key delete and updat…

677962d

…e filters

test(queryset): add negative controls in foreign key delete and updat…

3c575cc

…e filters

Update CHANGELOG.rst

debd9f1

Merge branch 'develop' into fix/queryset

39a4281

noy-solvin requested a review from waketzheng June 16, 2026 11:14

waketzheng reviewed Jun 23, 2026

View reviewed changes

Comment thread CHANGELOG.rst Outdated

Update CHANGELOG.rst

f1e6442

noy-solvin requested a review from waketzheng June 25, 2026 11:11

solvin-ai-teammate and others added 3 commits August 9, 2026 13:59

Merge remote-tracking branch 'upstream/develop' into fix/queryset

f781ec5

Merge branch 'tortoise:develop' into fix/queryset

5b2fdf4

fixed abondar's comments

4727f84

waketzheng requested changes Aug 24, 2026

View reviewed changes



		def test_update_query_postgres_dialect_coverage(db):
		from tortoise.backends.base.client import Capabilities



		def test_delete_query_postgres_dialect_coverage(db):
		from tortoise.backends.base.client import Capabilities



		@pytest.mark.asyncio
		async def test_delete_limit_order_by_with_join(db):

Uh oh!

Conversation

noy-solvin commented Mar 11, 2026

Description

Motivation and Context

How Has This Been Tested?

Checklist:

Uh oh!

codspeed-hq Bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merging this PR will not alter performance

Uh oh!

Uh oh!

Uh oh!

Uh oh!

themavik left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

noy-solvin commented Jun 16, 2026

🔍 The Problem

🛠️ The Solution

🟢 Confidence: High

📊 Solvin Autonomous Verification Matrix

✅ Verification

Uh oh!

noy-solvin commented Jun 23, 2026

Uh oh!

Uh oh!

noy-solvin commented Jun 25, 2026

Uh oh!

noy-solvin commented Aug 9, 2026

Uh oh!

waketzheng commented Aug 9, 2026

Uh oh!

waketzheng commented Aug 9, 2026

Uh oh!

noy-solvin commented Aug 11, 2026

Uh oh!

waketzheng Aug 23, 2026

Choose a reason for hiding this comment

Uh oh!

waketzheng Aug 23, 2026

Choose a reason for hiding this comment

Uh oh!

waketzheng Aug 23, 2026

Choose a reason for hiding this comment

Uh oh!

waketzheng Aug 23, 2026

Choose a reason for hiding this comment

Uh oh!

waketzheng Aug 23, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codspeed-hq Bot commented Mar 12, 2026 •

edited

Loading