Ticket #16184: introspection.py.patch

django/contrib/gis/db/backends/postgis/introspection.py

@@ -22 +22 @@
         # PostGIS custom data types.
         oid_sql = 'SELECT "oid" FROM "pg_type" WHERE "typname" = %s'
         try:
-            cursor.execute(oid_sql, ('geometry',))
-            GEOM_TYPE = cursor.fetchone()[0]
-            postgis_types = { GEOM_TYPE : 'GeometryField' }
+            fields = [ ('geometry', 'GeometryField' ) ]
             if self.connection.ops.geography:
-                cursor.execute(oid_sql, ('geography',))
-                GEOG_TYPE = cursor.fetchone()[0]
                 # The value for the geography type is actually a tuple
                 # to pass in the `geography=True` keyword to the field
                 # definition.
-                postgis_types[GEOG_TYPE] = ('GeometryField', {'geography' : True})
+                fields.append( ( 'geography', ('GeometryField', {'geography' : True})) )
+
+            postgis_types = {}
+            for f in fields:
+                cursor.execute(oid_sql, (f[0],))
+                for r in cursor.fetchall():
+                    postgis_types[r[0]] = f[1]
         finally:
             cursor.close()