diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-12-29 23:41:04 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-12-29 23:41:04 +0000 |
| commit | 2698c8facbdb3e7fdb04d933a6541fc4bcc71cf6 (patch) | |
| tree | ece3f66e84d258f7e9c8ec713b775cce71abbdab /lib/sqlalchemy/dialects/postgresql | |
| parent | d732e7bf261504f34c9b9d5049a9875633c3e4b3 (diff) | |
| download | sqlalchemy-2698c8facbdb3e7fdb04d933a6541fc4bcc71cf6.tar.gz | |
- postgresql dialect can properly detect pg "devel" version
strings, i.e. "8.5devel" [ticket:1636]
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql')
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index 1d7240fbf..2f9a5b5e4 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -706,10 +706,10 @@ class PGDialect(default.DefaultDialect): def _get_server_version_info(self, connection): v = connection.execute("select version()").scalar() - m = re.match('PostgreSQL (\d+)\.(\d+)\.(\d+)', v) + m = re.match('PostgreSQL (\d+)\.(\d+)(?:\.(\d+))?(?:devel)?', v) if not m: raise AssertionError("Could not determine version from string '%s'" % v) - return tuple([int(x) for x in m.group(1, 2, 3)]) + return tuple([int(x) for x in m.group(1, 2, 3) if x is not None]) @reflection.cache def get_table_oid(self, connection, table_name, schema=None, **kw): |
