Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Ensured a connection is established when checking the database version.

Fixed a test broken by 21765c0. Refs #18135.
  • Loading branch information...
commit ebabd772911f732ef54e014f130f6f5530198e14 1 parent 9a3988c
Aymeric Augustin aaugustin authored
12 django/db/backends/__init__.py
View
@@ -352,6 +352,18 @@ def cursor(self):
def make_debug_cursor(self, cursor):
return util.CursorDebugWrapper(cursor, self)
+ @contextmanager
+ def temporary_connection(self):
+ # Ensure a connection is established, and avoid leaving a dangling
+ # connection, for operations outside of the request-response cycle.
+ must_close = self.connection is None
+ cursor = self.cursor()
+ try:
+ yield
+ finally:
+ cursor.close()
+ if must_close:
+ self.close()
class BaseDatabaseFeatures(object):
allows_group_by_pk = False
3  django/db/backends/mysql/base.py
View
@@ -453,7 +453,8 @@ def _rollback(self):
@cached_property
def mysql_version(self):
- server_info = self.connection.get_server_info()
+ with self.temporary_connection():
+ server_info = self.connection.get_server_info()
match = server_version_re.match(server_info)
if not match:
raise Exception('Unable to determine MySQL version from version string %r' % server_info)
4 django/db/backends/oracle/base.py
View
@@ -623,8 +623,10 @@ def _commit(self):
@cached_property
def oracle_version(self):
+ with self.temporary_connection():
+ version = self.connection.version
try:
- return int(self.connection.version.split('.')[0])
+ return int(version.split('.')[0])
except ValueError:
return None
3  django/db/backends/postgresql_psycopg2/base.py
View
@@ -152,7 +152,8 @@ def close(self):
@cached_property
def pg_version(self):
- return get_version(self.connection)
+ with self.temporary_connection():
+ return get_version(self.connection)
def get_connection_params(self):
settings_dict = self.settings_dict
3  django/db/backends/postgresql_psycopg2/operations.py
View
@@ -195,8 +195,7 @@ def check_aggregate_support(self, aggregate):
NotImplementedError if this is the database in use.
"""
if aggregate.sql_function in ('STDDEV_POP', 'VAR_POP'):
- pg_version = self.connection.pg_version
- if pg_version >= 80200 and pg_version <= 80204:
+ if 80200 <= self.connection.pg_version <= 80204:
raise NotImplementedError('PostgreSQL 8.2 to 8.2.4 is known to have a faulty implementation of %s. Please upgrade your version of PostgreSQL.' % aggregate.sql_function)
def max_name_length(self):
Please sign in to comment.
Something went wrong with that request. Please try again.