Merge pull request #1475 from saemideluxe/patch-1

Fixes #1239
django-commons · Jun 10, 2021 · 6ec6bfe · 6ec6bfe
2 parents ebd4ae3 + 7e2c161
commit 6ec6bfe
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/debug_toolbar/panels/sql/tracking.py b/debug_toolbar/panels/sql/tracking.py
@@ -55,9 +55,12 @@ def cursor(*args, **kwargs):
             )
 
         def chunked_cursor(*args, **kwargs):
-            return state.Wrapper(
-                connection._djdt_chunked_cursor(*args, **kwargs), connection, panel
-            )
+            # prevent double wrapping
+            # solves https://github.com/jazzband/django-debug-toolbar/issues/1239
+            cursor = connection._djdt_chunked_cursor(*args, **kwargs)
+            if not isinstance(cursor, state.Wrapper):
+                return state.Wrapper(cursor, connection, panel)
+            return cursor
 
         connection.cursor = cursor
         connection.chunked_cursor = chunked_cursor