This addressed a regression introduced by a96b901932
as identified by Ran Benita.
This commit is contained in:
parent
edec11ce86
commit
7071f8f272
|
@ -195,7 +195,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
|
|||
return connection
|
||||
|
||||
def ensure_timezone(self):
|
||||
if not self.is_usable():
|
||||
if self.connection is None:
|
||||
return False
|
||||
conn_timezone_name = self.connection.get_parameter_status('TimeZone')
|
||||
timezone_name = self.timezone_name
|
||||
|
@ -208,7 +208,6 @@ class DatabaseWrapper(BaseDatabaseWrapper):
|
|||
def init_connection_state(self):
|
||||
self.connection.set_client_encoding('UTF8')
|
||||
|
||||
self.ensure_connection()
|
||||
timezone_changed = self.ensure_timezone()
|
||||
if timezone_changed:
|
||||
# Commit after setting the time zone (see #17062)
|
||||
|
@ -248,8 +247,6 @@ class DatabaseWrapper(BaseDatabaseWrapper):
|
|||
self.cursor().execute('SET CONSTRAINTS ALL DEFERRED')
|
||||
|
||||
def is_usable(self):
|
||||
if self.connection is None:
|
||||
return False
|
||||
try:
|
||||
# Use a psycopg cursor directly, bypassing Django's utilities.
|
||||
self.connection.cursor().execute("SELECT 1")
|
||||
|
|
|
@ -134,6 +134,12 @@ class Tests(TestCase):
|
|||
finally:
|
||||
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):
|
||||
with connection.cursor() as cursor:
|
||||
cursor.execute('SELECT %s', (val,))
|
||||
|
|
Loading…
Reference in New Issue