From 13c2a8a51053f1bb85b4847632801a7e41f20d64 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 9 May 2017 12:17:04 -0400 Subject: Use regexp to parse cx_oracle version string Fixed bug in cx_Oracle dialect where version string parsing would fail for cx_Oracle version 6.0b1 due to the "b" character. Version string parsing is now via a regexp rather than a simple split. Change-Id: I2af7172b0d7184e3ea3bd051e9fa8d6ca2a571cd Fixes: #3975 --- lib/sqlalchemy/dialects/oracle/cx_oracle.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/dialects') diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index 93b6987ac..c28414245 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -709,8 +709,8 @@ class OracleDialect_cx_oracle(OracleDialect): self._retry_on_12516 = _retry_on_12516 if hasattr(self.dbapi, 'version'): - self.cx_oracle_ver = tuple([int(x) for x in - self.dbapi.version.split('.')]) + self.cx_oracle_ver = self._parse_cx_oracle_ver(self.dbapi.version) + else: self.cx_oracle_ver = (0, 0, 0) @@ -778,6 +778,16 @@ class OracleDialect_cx_oracle(OracleDialect): self.dbapi.BINARY: oracle.RAW(), } + def _parse_cx_oracle_ver(self, version): + m = re.match(r'(\d+)\.(\d+)(?:\.(\d+))?', version) + if m: + return tuple( + int(x) + for x in m.group(1, 2, 3) + if x is not None) + else: + return (0, 0, 0) + @classmethod def dbapi(cls): import cx_Oracle -- cgit v1.2.1