Changeset 8455

Timestamp:

08/20/08 17:38:15 (11 months ago)

Author:

mtredinnick

Message:

Made it possible to pickle DateQuerySets?.

Files:

• django/trunk/django/db/models/query.py (modified) (2 diffs)
• django/trunk/django/db/models/sql/datastructures.py (modified) (1 diff)
• django/trunk/django/db/models/sql/subqueries.py (modified) (1 diff)
• django/trunk/tests/regressiontests/queries/models.py (modified) (1 diff)

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

@@ -453 +453 @@
-        assert order in ('ASC', 'DESC'), \
-                "'order' must be either 'ASC' or 'DESC'."
-
-
-
-
-
-
+
+
-
-    def none(self):
@@ -722 +718 @@
-        self.query = self.query.clone(klass=sql.DateQuery, setup=True)
-        self.query.select = []
-
-
-
+
+
+
+
+
+
-
-    def _clone(self, klass=None, setup=False, **kwargs):
-        c = super(DateQuerySet, self)._clone(klass, False, **kwargs)
- = self._field
+_name = self._field_name
-        c._kind = self._kind
-        if setup and hasattr(c, '_setup_query'):

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

@@ -86 +86 @@
-        self.col = col
-        self.lookup_type = lookup_type
-
+ 
-
-    def relabel_aliases(self, change_map):

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

@@ -344 +344 @@
-    back to Python objects, so we put it in a separate class.
-    """
+    def __getstate__(self):
+        """
+        Special DateQuery-specific pickle handling.
+        """
+        for elt in self.select:
+            if isinstance(elt, Date):
+                # Eliminate a method reference that can't be pickled. The
+                # __setstate__ method restores this.
+                elt.date_sql_func = None
+        return super(DateQuery, self).__getstate__()
+
+    def __setstate__(self, obj_dict):
+        super(DateQuery, self).__setstate__(obj_dict)
+        for elt in self.select:
+            if isinstance(elt, Date):
+                self.date_sql_func = self.connection.ops.date_trunc_sql
+
-    def results_iter(self):
-        """

django/trunk/tests/regressiontests/queries/models.py

@@ -898 +898 @@
-[<ExtraInfo: e1>]
-
+Pickling of DateQuerySets used to fail
+>>> qs = Item.objects.dates('created', 'month')
+>>> _ = pickle.loads(pickle.dumps(qs))
+
-"""}
-