Commit 3fc72ca8 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

[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
parent a899f7c6
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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):
    """