diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-01 07:20:19 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-01 07:20:19 +0000 |
| commit | 3fc72ca8a819dec0da5506dce810238df86a8ae4 (patch) | |
| tree | c8e35d100d4672776d761696911e7af91bed89d7 /django/db/backends/postgresql | |
| parent | a899f7c662a6f77b9d0768ee7d35cf01cd74ec1e (diff) | |
[1.0.X] Fixed #8737 -- Made the PostgreSQL version number detection more flexible.
Backport of r9931 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/backends/postgresql')
| -rw-r--r-- | django/db/backends/postgresql/version.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/django/db/backends/postgresql/version.py b/django/db/backends/postgresql/version.py index e14d791b07..ed2ad9e441 100644 --- a/django/db/backends/postgresql/version.py +++ b/django/db/backends/postgresql/version.py @@ -4,7 +4,12 @@ Extracts the version of the PostgreSQL server. import re -VERSION_RE = re.compile(r'PostgreSQL (\d+)\.(\d+)\.') +# This reg-exp is intentionally fairly flexible here. Require only the major +# and minor version numbers, but need to be able to handle standard stuff like: +# PostgreSQL 8.3.6 +# EnterpriseDB 8.3 +# PostgreSQL 8.3 beta4 +VERSION_RE = re.compile(r'\S+ (\d+)\.(\d+)') def get_version(cursor): """ |