summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2018-09-26 08:51:27 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2018-09-26 08:54:51 +0200
commit1f8a5d4face94d9c0cdb292a8ccfae7158b71ebc (patch)
treeb1f6a2d29e70a644e512ba8fa90b30c86aeb6527
parentcdb8ee741d0bc72713baf6612e4218d44cfd3958 (diff)
downloaddjango-1f8a5d4face94d9c0cdb292a8ccfae7158b71ebc.tar.gz
[2.1.x] Made DatabaseWrapper.oracle_version() return a full version tuple.
Backport of 90d93a1b425c0e6e3d88afa9fff78790300e1e38 from master
-rw-r--r--django/db/backends/oracle/base.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 2d953af2e4..1c25c9e8e5 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -301,16 +301,9 @@ class DatabaseWrapper(BaseDatabaseWrapper):
return True
@cached_property
- def oracle_full_version(self):
- with self.temporary_connection():
- return self.connection.version
-
- @cached_property
def oracle_version(self):
- try:
- return int(self.oracle_full_version.split('.')[0])
- except ValueError:
- return None
+ with self.temporary_connection():
+ return tuple(int(x) for x in self.connection.version.split('.'))
class OracleParam: