Fix Subquery support for Django <3.0

Mojtaba-saf · Sep 26, 2020 · 1aac489 · 1aac489
1 parent da92389
commit 1aac489
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cacheops/tree.py b/cacheops/tree.py
@@ -129,7 +129,9 @@ def table_for(alias):
     # Add any subqueries used for annotation
     if qs.query.annotations:
         subqueries = (
-            query_dnf(q.query) for q in qs.query.annotations.values() if type(q) is Subquery
+            # Django 3.0+ sets Subquery.query
+            query_dnf(getattr(q, 'query', q.queryset.query)) for q in qs.query.annotations.values()
+            if type(q) is Subquery
         )
         dnfs_.update(join_with(lcat, subqueries))