Changeset 8112

Timestamp:

07/27/08 13:38:56 (5 months ago)

Author:

mtredinnick

Message:

Fixed #7886 -- Reordered some code in Query.results_iter() to ensure that all
the prequisites are correctly initialised prior to using them. Only affects
Oracle and other db backends requiring resolve_columns() (e.g. MS SQL?)

Files:

• django/trunk/django/db/models/sql/query.py (modified) (1 diff)

django/trunk/django/db/models/sql/query.py

@@ -198 +198 @@
-        """
-        resolve_columns = hasattr(self, 'resolve_columns')
-
-
-
-
-
+
-        for rows in self.execute_sql(MULTI):
-            for row in rows:
-                if resolve_columns:
+                    if fields is None:
+                        # We only set this up here because
+                        # related_select_fields isn't populated until
+                        # execute_sql() has been called.
+                        if self.select_fields:
+                            fields = self.select_fields + self.related_select_fields
+                        else:
+                            fields = self.model._meta.fields
-                    row = self.resolve_columns(row, fields)
-                yield row