Changeset 7457

Timestamp:

04/25/08 01:54:35 (2 months ago)

Author:

mtredinnick

Message:

queryset-refactor: An attempt to fix an ambiguous column error that can arise
in Oracle queries. Adds an options to add output column aliases.

The testing I can do shows that the query is being constructed correctly. I
haven't run the test against an Oracle install, though.

Refs #7057 (ticket can be closed if the Oracle tests pass).

Files:

• django/branches/queryset-refactor/django/db/backends/oracle/query.py (modified) (3 diffs)
• django/branches/queryset-refactor/django/db/models/sql/query.py (modified) (4 diffs)

django/branches/queryset-refactor/django/db/backends/oracle/query.py

@@ -73 +73 @@
-            return values
-
-
+, with_col_aliases=False
-            """
-            Creates the SQL for this query. Returns the SQL string and list
@@ -89 +89 @@
-            # `as_sql`.
-            if not do_offset:
-
+
+
-
-            # `get_columns` needs to be called before `get_ordering` to
@@ -111 +112 @@
-            # extra selection SQL.
-            self.extra_select['rn'] = 'ROW_NUMBER() OVER (ORDER BY %s )' % rn_orderby
-
+
+
-
-            # Constructing the result SQL, using the initial select SQL

django/branches/queryset-refactor/django/db/models/sql/query.py

@@ -207 +207 @@
-        return number
-
-
+, with_col_aliases=False
-        """
-        Creates the SQL for this query. Returns the SQL string and list of
@@ -216 +216 @@
-        """
-        self.pre_sql_setup()
-
+with_col_aliases
-        ordering = self.get_ordering()
-
@@ -355 +355 @@
-            self.fill_related_selections()
-
-
+, with_aliases=False
-        """
-        Return the list of columns to use in the select statement. If no
-        columns have been specified, returns all columns relating to fields in
-        the model.
+
+        If 'with_aliases' is true, any column names that are duplicated
+        (without the table names) are given unique aliases. This is needed in
+        some cases to avoid ambiguitity with nested queries.
-        """
-        qn = self.quote_name_unless_alias
-        result = ['(%s) AS %s' % (col, alias) for alias, col in self.extra_select.iteritems()]
-        aliases = self.extra_select.keys()
+        if with_aliases:
+            col_aliases = set(aliases)
+        else:
+            col_aliases = set()
-        if self.select:
-            for col in self.select:
-                if isinstance(col, (list, tuple)):
-                    r = '%s.%s' % (qn(col[0]), qn(col[1]))
-
-
+
+
+
+
+
+
+
+
+
-                else:
-                    result.append(col.as_sql(quote_func=qn))
-                    if hasattr(col, 'alias'):
-                        aliases.append(col.alias)
+                        col_aliases.add(col.alias)
-        elif self.default_cols:
-
+, with_aliases, col_aliases
-            result.extend(cols)
-            aliases.extend(cols)
-        for table, col in self.related_select_cols:
-            r = '%s.%s' % (qn(table), qn(col))
-
-
+
+
+
+
+
+
+
+
+
-
-        self._select_aliases = set(aliases)
-        return result
-
-
+
+
-        """
-        Computes the default columns for selecting every field in the base
@@ -407 +431 @@
-                seen[model] = alias
-            if as_str:
-
+
+
+
+
+
+
-            else:
-                result.append((alias, field.column))