Ticket #3053: django_unambigous.patch

db/backends/oracle/query.py

@@ -23 +23 @@
     Helper function that recursively populates the select, tables and where (in
     place) for select_related queries.
     """
-    from django.db.models.fields import AutoField
     qn = backend.quote_name
     for f in opts.fields:
         if f.rel and not f.null:
@@ -37 +36 @@
             cache_tables_seen.append(db_table)
             where.append('%s.%s = %s.%s' % \
                 (qn(old_prefix), qn(f.column), qn(db_table), qn(f.rel.get_related_field().column)))
-            select.extend(['%s.%s' % (backend.quote_name(db_table), backend.quote_name(f2.column)) for f2 in f.rel.to._meta.fields if not isinstance(f2, AutoField)])
+            select.extend(['%s.%s' % (backend.quote_name(db_table), backend.quote_name(f2.column)) for f2 in f.rel.to._meta.fields])
             fill_table_cache(f.rel.to._meta, select, tables, where, db_table, cache_tables_seen)
 
 
@@ -168 +167 @@
 
             # LIMIT and OFFSET clauses
             # To support limits and offsets, Oracle requires some funky rewriting of an otherwise normal looking query.
-            select_clause = ",".join(select)
+            select_clause = ",".join(["%s as COLUMN#%s"%(select[i], i) for i in xrange(len(select))])
             distinct = (self._distinct and "DISTINCT " or "")
 
             if order_by: