p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[2.2.x] Fixed #30193, Refs #28478 -- Avoided PostgreSQL connection health checks on initialization. 

This addressed a regression introduced by a96b901932 as identified by Ran Benita.
Backport of 7071f8f272 from master
This commit is contained in:
Simon Charette 2019-02-20 04:59:40 -05:00 committed by Carlton Gibson
parent 9278acfd12
commit 7f25344c2e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/backends/postgresql/base.py
View File

@ -195,7 +195,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
return connection return connection
def ensure_timezone(self): def ensure_timezone(self):
if not self.is_usable(): if self.connection is None:
return False return False
conn_timezone_name = self.connection.get_parameter_status('TimeZone') conn_timezone_name = self.connection.get_parameter_status('TimeZone')
timezone_name = self.timezone_name timezone_name = self.timezone_name
@ -208,7 +208,6 @@ class DatabaseWrapper(BaseDatabaseWrapper):
def init_connection_state(self): def init_connection_state(self):
self.connection.set_client_encoding('UTF8') self.connection.set_client_encoding('UTF8')
self.ensure_connection()
timezone_changed = self.ensure_timezone() timezone_changed = self.ensure_timezone()
if timezone_changed: if timezone_changed:
# Commit after setting the time zone (see #17062) # Commit after setting the time zone (see #17062)
@ -248,8 +247,6 @@ class DatabaseWrapper(BaseDatabaseWrapper):
self.cursor().execute('SET CONSTRAINTS ALL DEFERRED') self.cursor().execute('SET CONSTRAINTS ALL DEFERRED')
def is_usable(self): def is_usable(self):
if self.connection is None:
return False
try: try:
# Use a psycopg cursor directly, bypassing Django's utilities. # Use a psycopg cursor directly, bypassing Django's utilities.
self.connection.cursor().execute("SELECT 1") self.connection.cursor().execute("SELECT 1")

6
tests/backends/postgresql/tests.py
View File

@ -134,6 +134,12 @@ class Tests(TestCase):
finally: finally:
new_connection.close() new_connection.close()
def test_connect_no_is_usable_checks(self):
new_connection = connection.copy()
with mock.patch.object(new_connection, 'is_usable') as is_usable:
new_connection.connect()
is_usable.assert_not_called()
def _select(self, val): def _select(self, val):
with connection.cursor() as cursor: with connection.cursor() as cursor:
cursor.execute('SELECT %s', (val,)) cursor.execute('SELECT %s', (val,))