noripyt / django-cachalot / 21406042386

98%

push

github

fix: Handle Django 6.0 resolved subquery detection in table extraction

In Django 6.0, Subquery.resolve_expression() returns a Query object
directly with subquery=True instead of keeping the Subquery wrapper.
This broke table detection for annotations containing subqueries when
CACHALOT_FINAL_SQL_CHECK=False.

Add check for Query objects with subquery=True attribute to properly
detect tables in resolved subqueries on Django 6.0+.

Fixes failing tests:
- test_annotate_subquery
- test_annotate_case_with_when
- test_annotate_case_with_when_and_query_in_default
- test_annotate_coalesce
- test_custom_subquery_no_check

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

2 of 2 new or added lines in 1 file covered. (100.0%)

711 of 724 relevant lines covered (98.2%)

10.8 hits per line