Ticket #14648: 14648.1.diff

django/contrib/gis/db/models/sql/compiler.py

@@ -56 +56 @@
                         col_aliases.add(col[1])
                 else:
                     result.append(col.as_sql(qn, self.connection))
-                    
+
                     if hasattr(col, 'alias'):
                         aliases.add(col.alias)
                         col_aliases.add(col.alias)
@@ -169 +169 @@
         from extra selection SQL get resolved appropriately into Python
         objects.
         """
+        if not hasattr(self.query, 'extra_select_fields'):
+            return row
         values = []
         aliases = self.query.extra_select.keys()
         if self.query.aggregates:
@@ -190 +192 @@
                                self.query.extra_select_fields.get(a, None),
                                self.connection)
                   for v, a in izip(row[rn_offset:index_start], aliases)]
+
         if self.connection.ops.oracle or getattr(self.query, 'geo_values', False):
             # We resolve the rest of the columns if we're on Oracle or if
             # the `geo_values` attribute is defined.
@@ -202 +205 @@
     #### Routines unique to GeoQuery ####
     def get_extra_select_format(self, alias):
         sel_fmt = '%s'
-        if alias in self.query.custom_select:
+        if alias in getattr(self.query, 'custom_select', {}):
             sel_fmt = sel_fmt % self.query.custom_select[alias]
         return sel_fmt