Changeset 8053

Timestamp:

07/22/08 03:23:20 (5 months ago)

Author:

mtredinnick

Message:

Fixed #7813 -- Allow pickling of Query classes that use select_related().
Based on a patch from Justin Bronn.

The test in this patch most likely breaks on Oracle. That's another issue.

Files:

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

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

@@ -107 +107 @@
-        """
-        obj_dict = self.__dict__.copy()
+        obj_dict['related_select_fields'] = []
+        obj_dict['related_select_cols'] = []
-        del obj_dict['connection']
-        return obj_dict

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

@@ -786 +786 @@
->>> out = pickle.dumps(Item.objects.all())
-
+We should also be able to pickle things that use select_related(). The only
+tricky thing here is to ensure that we do the related selections properly after
+unpickling.
+>>> qs = Item.objects.select_related()
+>>> query = qs.query.as_sql()[0]
+>>> query2 = pickle.loads(pickle.dumps(qs.query))
+>>> query2.as_sql()[0] == query
+True
+
-Bug #7277
->>> ann1 = Annotation.objects.create(name='a1', tag=t1)