Changeset 7500

Timestamp:

04/28/08 09:43:46 (2 months ago)

Author:

brosner

Message:

newforms-admin: Merged from trunk up to [7499].

Files:

• django/branches/newforms-admin (modified) (1 prop)
• django/branches/newforms-admin/django/db/backends/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/backends/mysql/base.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/backends/mysql_old/base.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/models/fields/__init__.py (modified) (2 diffs)
• django/branches/newforms-admin/django/db/models/query.py (modified) (3 diffs)
• django/branches/newforms-admin/django/db/models/sql/query.py (modified) (4 diffs)
• django/branches/newforms-admin/django/db/models/sql/subqueries.py (modified) (2 diffs)
• django/branches/newforms-admin/docs/db-api.txt (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/queries/models.py (modified) (2 diffs)

django/branches/newforms-admin/django/db/backends/__init__.py

@@ -52 +52 @@
-    uses_custom_query_class = False
-    empty_fetchmany_value = []
+    update_can_self_select = True
-
-class BaseDatabaseOperations(object):

django/branches/newforms-admin/django/db/backends/mysql/base.py

@@ -64 +64 @@
-    inline_fk_references = False
-    empty_fetchmany_value = ()
+    update_can_self_select = False
-
-class DatabaseOperations(BaseDatabaseOperations):

django/branches/newforms-admin/django/db/backends/mysql_old/base.py

@@ -68 +68 @@
-    inline_fk_references = False
-    empty_fetchmany_value = ()
+    update_can_self_select = False
-
-class DatabaseOperations(BaseDatabaseOperations):

django/branches/newforms-admin/django/db/models/fields/__init__.py

@@ -10 +10 @@
-from django.db import get_creation_module
-from django.db.models import signals
+from django.db.models.query_utils import QueryWrapper
-from django.dispatch import dispatcher
-from django.conf import settings
@@ -225 +226 @@
-    def get_db_prep_lookup(self, lookup_type, value):
-        "Returns field's value prepared for database lookup."
+        if hasattr(value, 'as_sql'):
+            sql, params = value.as_sql()
+            return QueryWrapper(('(%s)' % sql), params)
-        if lookup_type in ('exact', 'regex', 'iregex', 'gt', 'gte', 'lt', 'lte', 'month', 'day', 'search'):
-            return [value]

django/branches/newforms-admin/django/db/models/query.py

@@ -29 +29 @@
-    ########################
-
+    def __getstate__(self):
+        """
+        Allows the Queryset to be pickled.
+        """
+        # Force the cache to be fully populated.
+        len(self)
+
+        obj_dict = self.__dict__.copy()
+        obj_dict['_iter'] = None
+        return obj_dict
+
-    def __repr__(self):
-        return repr(list(self))
@@ -38 +49 @@
-        if self._result_cache is None:
-            if self._iter:
-()
+
-            else:
-                self._result_cache = list(self.iterator())
@@ -498 +509 @@
-        # names of the model fields to select.
-
-    def __iter__(self):
-        return self.iterator()
-
-    def iterator(self):
-        self.query.trim_extra_select(self.extra_names)

django/branches/newforms-admin/django/db/models/sql/query.py

@@ -99 +99 @@
-        memo[id(self)] = result
-        return result
+
+    def __getstate__(self):
+        """
+        Pickling support.
+        """
+        obj_dict = self.__dict__.copy()
+        del obj_dict['connection']
+        return obj_dict
+
+    def __setstate__(self, obj_dict):
+        """
+        Unpickling support.
+        """
+        self.__dict__.update(obj_dict)
+        # XXX: Need a better solution for this when multi-db stuff is
+        # supported. It's the only class-reference to the module-level
+        # connection variable.
+        self.connection = connection
-
-    def get_meta(self):
@@ -896 +914 @@
-        (filter_string, value). E.g. ('name__contains', 'fred')
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        If 'can_reuse' is a set, we are processing a component of a
@@ -1002 +1026 @@
-        self.where.add((alias, col, field, lookup_type, value), connector)
-        if negate:
-            self.where.negate()
-            for alias in join_list:
-                self.promote_alias(alias)
@@ -1040 +1063 @@
-                self.add_q(child, used_aliases)
-                self.where.end_subtree()
-                if q_object.negated:
-                    self.where.children[-1].negate()
-            else:
-                self.add_filter(child, connector, q_object.negated,
-                        can_reuse=used_aliases)
-            connector = q_object.connector
+        if q_object.negated:
+            self.where.negate()
-        if subtree:
-            self.where.end_subtree()

django/branches/newforms-admin/django/db/models/sql/subqueries.py

@@ -160 +160 @@
-        query = self.clone(klass=Query)
-        query.bump_prefix()
-        query.select = []
-        query.extra_select = {}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        # Now we adjust the current query: reset the where clause and get rid
-        # of all the tables we don't need (since they're in the sub-select).
-        self.where = self.where_class()
-
+
+
+
+
-            idents = []
-            for rows in query.execute_sql(MULTI):
@@ -174 +190 @@
-            self.related_ids = idents
-        else:
+            # The fast path. Filters and updates in one query.
-            self.add_filter(('pk__in', query))
-        for alias in self.tables[1:]:

django/branches/newforms-admin/docs/db-api.txt

@@ -376 +376 @@
-      iterating over a ``QuerySet`` will take advantage of your database to
-      load data and instantiate objects only as you need them.
+
+
+Pickling QuerySets
+~~~~~~~~~~~~~~~~~~
+
+If you pickle_ a ``QuerySet``, this will also force all the results to be
+loaded into memory prior to pickling. This is because pickling is usually used
+as a precursor to caching and when the cached queryset is reloaded, you want
+the results to already be present. This means that when you unpickle a
+``QuerySet``, it contains the results at the moment it was pickled, rather
+than the results that are currently in the database.
+
+If you only want to pickle the necessary information to recreate the
+``Queryset`` from the database at a later time, pickle the ``query`` attribute
+of the ``QuerySet``. You can then recreate the original ``QuerySet`` (without
+any results loaded) using some code like this::
+
+    >>> import pickle
+    >>> query = pickle.loads(s)     # Assuming 's' is the pickled string.
+    >>> qs = MyModel.objects.all()
+    >>> qs.query = query            # Restore the original 'query'.
+
+.. _pickle: http://docs.python.org/lib/module-pickle.html
-
-Limiting QuerySets

django/branches/newforms-admin/tests/regressiontests/queries/models.py

@@ -117 +117 @@
-    class Meta:
-        ordering = ['z']
+
+# A model and custom default manager combination.
+class CustomManager(models.Manager):
+    def get_query_set(self):
+        return super(CustomManager, self).get_query_set().filter(public=True,
+                tag__name='t1')
+
+class ManagedModel(models.Model):
+    data = models.CharField(max_length=10)
+    tag = models.ForeignKey(Tag)
+    public = models.BooleanField(default=True)
+
+    objects = CustomManager()
+    normal_manager = models.Manager()
+
+    def __unicode__(self):
+        return self.data
+
-
-__test__ = {'API_TESTS':"""
@@ -659 +677 @@
->>> Item.objects.values('note__note').order_by('queries_note.note', 'id')
-[{'note__note': u'n2'}, {'note__note': u'n3'}, {'note__note': u'n3'}, {'note__note': u'n3'}]
+
+Bug #7096 -- Make sure exclude() with multiple conditions continues to work.
+>>> Tag.objects.filter(parent=t1, name='t3').order_by('name')
+[<Tag: t3>]
+>>> Tag.objects.exclude(parent=t1, name='t3').order_by('name')
+[<Tag: t1>, <Tag: t2>, <Tag: t4>, <Tag: t5>]
+>>> Item.objects.exclude(tags__name='t1', name='one').order_by('name').distinct()
+[<Item: four>, <Item: three>, <Item: two>]
+>>> Item.objects.filter(name__in=['three', 'four']).exclude(tags__name='t1').order_by('name')
+[<Item: four>, <Item: three>]
+
+More twisted cases, involving nested negations.
+>>> Item.objects.exclude(~Q(tags__name='t1', name='one'))
+[<Item: one>]
+>>> Item.objects.filter(~Q(tags__name='t1', name='one'), name='two')
+[<Item: two>]
+>>> Item.objects.exclude(~Q(tags__name='t1', name='one'), name='two')
+[<Item: four>, <Item: one>, <Item: three>]
+
+Bug #7095
+Updates that are filtered on the model being updated are somewhat tricky to get
+in MySQL. This exercises that case.
+>>> mm = ManagedModel.objects.create(data='mm1', tag=t1, public=True)
+>>> ManagedModel.objects.update(data='mm')
+
-"""}
-