diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-09-02 10:59:07 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-09-02 10:59:07 -0400 |
| commit | 7ea8485ea6db4af6b4862c624752c93090968d06 (patch) | |
| tree | 8f2a47ad9e28b39429de155cc919fa4d55f48e4d /lib/sqlalchemy | |
| parent | 764c9fee7245a9363a207cdf3828a4ba06550e0f (diff) | |
| parent | 4acf7df4f5dadd42abff683d665674c768fffdc3 (diff) | |
| download | sqlalchemy-7ea8485ea6db4af6b4862c624752c93090968d06.tar.gz | |
Merged in dahlia/sqlalchemy/enterprisedb (pull request #15)
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index 3e2e1eb10..c615db85d 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -1323,7 +1323,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+))?(?:devel)?', v) + m = re.match( + '(?:PostgreSQL|EnterpriseDB) ' + '(\d+)\.(\d+)(?:\.(\d+))?(?:\.\d+)?(?:devel)?', + v) if not m: raise AssertionError( "Could not determine version from string '%s'" % v) |