summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/db/models/sql/compiler.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 0778d38f4a..b197ab90cc 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -830,9 +830,14 @@ class SQLCompiler(object):
try:
cursor.execute(sql, params)
except Exception:
- with self.connection.wrap_database_errors:
- # Closing a server-side cursor could yield an error
+ try:
+ # Might fail for server-side cursors (e.g. connection closed)
cursor.close()
+ except Exception:
+ # Ignore clean up errors and raise the original error instead.
+ # Python 2 doesn't chain exceptions. Remove this error
+ # silencing when dropping Python 2 compatibility.
+ pass
raise
if result_type == CURSOR: