Changeset 6486

Timestamp:

10/13/07 21:12:40 (9 months ago)

Author:

mtredinnick

Message:

queryset-refactor: Ported DateQuerySet? and ValueQuerySet? over and fixed most of
the related tests.

Files:

• django/branches/queryset-refactor/django/db/models/base.py (modified) (1 diff)
• django/branches/queryset-refactor/django/db/models/query.py (modified) (8 diffs)
• django/branches/queryset-refactor/django/db/models/sql/datastructures.py (modified) (1 diff)
• django/branches/queryset-refactor/django/db/models/sql/query.py (modified) (12 diffs)

django/branches/queryset-refactor/django/db/models/base.py

@@ -339 +339 @@
-        qn = connection.ops.quote_name
-        op = is_next and '>' or '<'
-
+[
-            (qn(field.column), op, qn(field.column),
-
+]
-        param = smart_str(getattr(self, field.attname))
-
-
-
+
+
+
+
+
-        try:
-            return q[0]

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

@@ -254 +254 @@
-        return self._clone(klass=ValuesQuerySet, _fields=fields)
-
-    # FIXME: Not converted yet!
-    def dates(self, field_name, kind, order='ASC'):
-        """
@@ -266 +265 @@
-        # Let the FieldDoesNotExist exception propagate.
-        field = self.model._meta.get_field(field_name, many_to_many=False)
-
-
+
+
+
+
-
-    ##################################################################
@@ -390 +391 @@
-
-    def iterator(self):
-
-
-
-
-
-
-
-
-
-
+
+
-
-        # Construct two objects -- fields and field_names.
@@ -407 +400 @@
-        if self._fields:
-            if not extra_select:
-
+
+
-                field_names = self._fields
-            else:
@@ -414 +408 @@
-                for f in self._fields:
-                    if f in [field.name for field in self.model._meta.fields]:
-
+
+
-                        field_names.append(f)
-
-
+
+
+
-        else: # Default to all fields.
-            fields = self.model._meta.fields
-            field_names = [f.attname for f in fields]
-
-
-
+
-        if extra_select:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    def _clone(self, klass=None, **kwargs):
@@ -448 +432 @@
-class DateQuerySet(QuerySet):
-    def iterator(self):
-
-
-
-
-
+
+
+
-        if self._field.null:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    def _clone(self, klass=None, **kwargs):
@@ -498 +443 @@
-        c._field = self._field
-        c._kind = self._kind
-        c._order = self._order
-        return c
-
-# XXX; Everything below here is done.
-class EmptyQuerySet(QuerySet):
-    def __init__(self, model=None):
@@ -517 +460 @@
-        c._result_cache = []
-        return c
+
+    def iterator(self):
+        # This slightly odd construction is because we need an empty generator
+        # (it should raise StopIteration immediately).
+        yield iter([]).next()
-
-# QOperator, QAnd and QOr are temporarily retained for backwards compatibility.

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

@@ -58 +58 @@
-            return 'COUNT(%s)' % col
-
+class Date(object):
+    """
+    Add a date selection column.
+    """
+    def __init__(self, col, lookup_type, date_sql_func):
+        self.col = col
+        self.lookup_type = lookup_type
+        self.date_sql_func= date_sql_func
+
+    def relabel_aliases(self, change_map):
+        c = self.col
+        if isinstance(c, (list, tuple)):
+            self.col = (change_map.get(c[0], c[0]), c[1])
+
+    def as_sql(self, quote_func=None):
+        if not quote_func:
+            quote_func = lambda x: x
+        if isinstance(self.col, (list, tuple)):
+            col = '%s.%s' % tuple([quote_func(c) for c in self.col])
+        else:
+            col = self.col
+        return self.date_sql_func(self.lookup_type, col)
+

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

@@ -12 +12 @@
-from django.utils import tree
-from django.db.models.sql.where import WhereNode, AND, OR
-
-
+, Date
+, Field
-from django.contrib.contenttypes import generic
-from datastructures import EmptyResultSet
@@ -55 +55 @@
-NONE = None
-
+# FIXME: Add quote_name() calls around all the tables.
-class Query(object):
-    """
@@ -78 +79 @@
-        self.tables = []    # Aliases in the order they are created.
-        self.where = WhereNode(self)
+        self.group_by = []
-        self.having = []
-        self.group_by = []
-        self.order_by = []
-        self.low_mark, self.high_mark = 0, None  # Used for offset/limit
@@ -104 +105 @@
-        return sql % params
-
-
+klass=None, 
-        """
-        Creates a copy of the current instance. The 'kwargs' parameter can be
-        used by clients to update attributes after copying has taken place.
-        """
-
+
+
+
-        obj.table_map = self.table_map.copy()
-        obj.alias_map = copy.deepcopy(self.alias_map)
@@ -199 +202 @@
-        if where:
-            result.append('WHERE %s' % where)
-
+
+
+
+
+
+
+
+
+
+
-
-        ordering = self.get_ordering()
@@ -313 +325 @@
-        qn = self.connection.ops.quote_name
-        result = []
-
+ or self.extra_select
-            for col in self.select:
-                if isinstance(col, (list, tuple)):
-                    result.append('%s.%s' % (qn(col[0]), qn(col[1])))
-                else:
-
+quote_func=qn
-        else:
-            table_alias = self.tables[0]
@@ -332 +344 @@
-        return result
-
+    def get_grouping(self):
+        """
+        Returns a tuple representing the SQL elements in the "group by" clause.
+        """
+        qn = self.connection.ops.quote_name
+        result = []
+        for col in self.group_by:
+            if isinstance(col, (list, tuple)):
+                result.append('%s.%s' % (qn(col[0]), qn(col[1])))
+            elif hasattr(col, 'as_sql'):
+                result.append(col.as_sql(qn))
+            else:
+                result.append(str(col))
+        return result
+
-    def get_ordering(self):
-        """
@@ -340 +367 @@
-        opts = self.model._meta
-        result = []
-handle_legacy_orderlist(ordering)
+ordering
-            if field == '?':
-                result.append(self.connection.ops.random_function_sql())
+                continue
+            if isinstance(field, int):
+                if field < 0:
+                    order = 'DESC'
+                    field = -field
+                else:
+                    order = 'ASC'
+                result.append('%s %s' % (field, order))
-                continue
-            if field[0] == '-':
@@ -684 +719 @@
-        self.low_mark, self.high_mark = 0, None
-
+    def can_filter(self):
+        """
+        Returns True if adding filters to this instance is still possible.
+
+        Typically, this means no limits or offsets have been put on the results.
+        """
+        return not (self.low_mark or self.high_mark)
+
+    def add_local_columns(self, columns):
+        """
+        Adds the given column names to the select set, assuming they come from
+        the root model (the one given in self.model).
+        """
+        table = self.model._meta.db_table
+        self.select.extend([(table, col) for col in columns])
+
-    def add_ordering(self, *ordering):
-        """
-        Adds items from the 'ordering' sequence to the query's "order by"
-
+
+
+
-        """
-        self.order_by.extend(ordering)
@@ -696 +749 @@
-        """
-        self.order_by = []
-
-    def can_filter(self):
-        """
-        Returns True if adding filters to this instance is still possible.
-
-        Typically, this means no limits or offsets have been put on the results.
-        """
-        return not (self.low_mark or self.high_mark)
-
-    def add_count_column(self):
@@ -714 +759 @@
-        if not self.distinct:
-            select = Count()
-            # Distinct handling is now done in Count(), so don't do it at this
-            # level.
-            self.distinct = False
-        else:
-            select = Count((self.table_map[self.model._meta.db_table][0],
-                    self.model._meta.pk.column), True)
+            # Distinct handling is done in Count(), so don't do it at this
+            # level.
+            self.distinct = False
-        self.select = [select]
-        self.extra_select = {}
@@ -874 +919 @@
-            self.do_query(self.model._meta.db_table, values, where)
-
+class DateQuery(Query):
+    """
+    A DateQuery is a normal query, except that it specifically selects a single
+    date field. This requires some special handling when converting the results
+    back to Python objects, so we put it in a separate class.
+    """
+    def results_iter(self):
+        """
+        Returns an iterator over the results from executing this query.
+        """
+        resolve_columns = hasattr(self, 'resolve_columns')
+        if resolve_columns:
+            from django.db.models.fields import DateTimeField
+            fields = [DateTimeField()]
+        else:
+            from django.db.backends.util import typecast_timestamp
+            needs_string_cast = self.connection.features.needs_datetime_string_cast
+
+        for rows in self.execute_sql(MULTI):
+            for row in rows:
+                date = row[0]
+                if resolve_columns:
+                    date = self.resolve_columns([date], fields)[0]
+                elif needs_string_cast:
+                    date = typecast_timestamp(str(date))
+                yield date
+
+    def add_date_select(self, column, lookup_type, order='ASC'):
+        """
+        Converts the query into a date extraction query.
+        """
+        alias = self.join((None, self.model._meta.db_table, None, None))
+        select = Date((alias, column), lookup_type,
+                self.connection.ops.date_trunc_sql)
+        self.select = [select]
+        self.order_by = order == 'ASC' and [1] or [-1]
+        if self.connection.features.allows_group_by_ordinal:
+            self.group_by = [1]
+        else:
+            self.group_by = [select]
+
-def find_field(name, field_list, related_query):
-    """