Fix annotations introspection in Django 3.0

Mojtaba-saf · Sep 26, 2020 · 0527e22 · 0527e22
1 parent 8314c37
commit 0527e22
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cacheops/tree.py b/cacheops/tree.py
@@ -130,7 +130,8 @@ def table_for(alias):
     if qs.query.annotations:
         subqueries = (
             # Django 3.0+ sets Subquery.query
-            query_dnf(getattr(q, 'query', q.queryset.query)) for q in qs.query.annotations.values()
+            query_dnf(getattr(q, 'query', None) or getattr(q, 'queryset').query)
+            for q in qs.query.annotations.values()
             if type(q) is Subquery
         )
         dnfs_.update(join_with(lcat, subqueries))