From 05bdf4f44dc80ba2481699860fa0a73de80694ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Freitag?= Date: Fri, 13 Jan 2017 22:36:25 -0800 Subject: [PATCH] Refs #16614 -- Called _prepare_cursor() on every created cursor. --- django/db/backends/base/base.py | 4 ++-- django/db/backends/postgresql/base.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/django/db/backends/base/base.py b/django/db/backends/base/base.py index 9c35ca7e47..c50cf5266a 100644 --- a/django/db/backends/base/base.py +++ b/django/db/backends/base/base.py @@ -228,7 +228,7 @@ class BaseDatabaseWrapper(object): def _cursor(self, name=None): self.ensure_connection() with self.wrap_database_errors: - return self.create_cursor(name) + return self._prepare_cursor(self.create_cursor(name)) def _commit(self): if self.connection is not None: @@ -251,7 +251,7 @@ class BaseDatabaseWrapper(object): """ Creates a cursor, opening a connection if necessary. """ - return self._prepare_cursor(self._cursor()) + return self._cursor() def commit(self): """ diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index 91dee6a722..c40a67b2e1 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -223,14 +223,13 @@ class DatabaseWrapper(BaseDatabaseWrapper): def chunked_cursor(self): self._named_cursor_idx += 1 - db_cursor = self._cursor( + return self._cursor( name='_django_curs_%d_%d' % ( # Avoid reusing name in other threads threading.current_thread().ident, self._named_cursor_idx, ) ) - return self._prepare_cursor(db_cursor) def _set_autocommit(self, autocommit): with self.wrap_database_errors: