diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-02-18 19:11:56 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-02-18 22:13:05 +0100 |
| commit | 7b8529d206731bab01855a60f4a6f84e4221f2e1 (patch) | |
| tree | f590e9e21b5710a31c5fda4639fbafe9481d72dc | |
| parent | 282b2f40cd0aa09815001e178f60c9e71667d847 (diff) | |
Removed duplicate caching of mysql_version.
The manual caching in self.server_version and the cached_property
decorator are redundant.
| -rw-r--r-- | django/db/backends/mysql/base.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 5a23dce095..3719b3a6a7 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -394,7 +394,6 @@ class DatabaseWrapper(BaseDatabaseWrapper): def __init__(self, *args, **kwargs): super(DatabaseWrapper, self).__init__(*args, **kwargs) - self.server_version = None self.features = DatabaseFeatures(self) self.ops = DatabaseOperations(self) self.client = DatabaseClient(self) @@ -454,13 +453,11 @@ class DatabaseWrapper(BaseDatabaseWrapper): @cached_property def mysql_version(self): - if not self.server_version: - server_info = self.connection.get_server_info() - m = server_version_re.match(server_info) - if not m: - raise Exception('Unable to determine MySQL version from version string %r' % server_info) - self.server_version = tuple([int(x) for x in m.groups()]) - return self.server_version + 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) + return tuple([int(x) for x in match.groups()]) def disable_constraint_checking(self): """ |
