summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShai Berger <shai@platonix.com>2014-04-25 00:36:40 +0300
committerShai Berger <shai@platonix.com>2014-04-25 01:35:38 +0300
commit7421e1e320fc46a52af0a1e4518b0ce4344c1a0f (patch)
treeec6b7b2344ea217c966ce7ca7a5f74bd91f8f3bc
parentbee118a7011bda1b26e885c7258a8d5e04436863 (diff)
[1.7.x] Made sure cursor.close() does not complain if cursor is already closed on Oracle
Refs #22483 Backport of 53d97e4fe3 from master
-rw-r--r--django/db/backends/oracle/base.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 01f4960470..1a4ff172e8 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -917,6 +917,13 @@ class FormatStylePlaceholderCursor(object):
def fetchall(self):
return tuple(_rowfactory(r, self.cursor) for r in self.cursor.fetchall())
+ def close(self):
+ try:
+ self.cursor.close()
+ except Database.InterfaceError:
+ # already closed
+ pass
+
def var(self, *args):
return VariableWrapper(self.cursor.var(*args))