Ticket #10842: fix_unify_pgsql_re-option_a-django-1.1-dev.diff

django/db/backends/postgresql/operations.py

@@ -2 +2 @@
 
 from django.db.backends import BaseDatabaseOperations
 
-server_version_re = re.compile(r'PostgreSQL (\d{1,2})\.(\d{1,2})\.?(\d{1,2})?')
-
 # This DatabaseOperations class lives in here instead of base.py because it's
 # used by both the 'postgresql' and 'postgresql_psycopg2' backends.
 
@@ -14 +12 @@
     def _get_postgres_version(self):
         if self._postgres_version is None:
             from django.db import connection
+            from django.db.backends.postgresql.version import get_version
             cursor = connection.cursor()
-            cursor.execute("SELECT version()")
-            version_string = cursor.fetchone()[0]
-            m = server_version_re.match(version_string)
-            if not m:
-                raise Exception('Unable to determine PostgreSQL version from version() function string: %r' % version_string)
-            self._postgres_version = [int(val) for val in m.groups() if val]
+            self._postgres_version = get_version(cursor, precision=3)
         return self._postgres_version
     postgres_version = property(_get_postgres_version)
 
@@ -157 +151 @@
         NotImplementedError if this is the database in use.
         """
         if aggregate.sql_function == 'STDDEV_POP' or aggregate.sql_function == 'VAR_POP':
-            if self.postgres_version[0] == 8 and self.postgres_version[1] == 2 and self.postgres_version[2] <= 4:
+            if self.postgres_version[0] == 8 and self.postgres_version[1] == 2 and \
+                    (self.postgres_version[2] is None or self.postgres_version[2] <= 4):
                 raise NotImplementedError('PostgreSQL 8.2 to 8.2.4 is known to have a faulty implementation of %s. Please upgrade your version of PostgreSQL.' % aggregate.sql_function)

django/db/backends/postgresql/version.py

@@ -9 +9 @@
 #   PostgreSQL 8.3.6
 #   EnterpriseDB 8.3
 #   PostgreSQL 8.3 beta4
-VERSION_RE = re.compile(r'\S+ (\d+)\.(\d+)')
+#   PostgreSQL 8.4beta1
+VERSION_RE = re.compile(r'\S+ (\d+)\.(\d+)\.?(\d+)?')
 
-def get_version(cursor):
+def get_version(cursor, precision=2):
     """
     Returns a tuple representing the major and minor version number of the
     server. For example, (7, 4) or (8, 3).
     """
     cursor.execute("SELECT version()")
     version = cursor.fetchone()[0]
-    major, minor = VERSION_RE.search(version).groups()
-    return int(major), int(minor)
-
+    major, minor, minor2 = VERSION_RE.search(version).groups()
+    if precision == 1:
+        return major
+    elif precision == 2:
+        return int(major), int(minor)
+    else:
+        try:
+            return int(major), int(minor), int(minor2)
+        except (ValueError, TypeError):
+            #raise Exception('Unable to determine PostgreSQL version from version() function string: %r' % version)
+            return int(major), int(minor), None