Changeset 7511

Timestamp:

04/30/08 19:32:50 (2 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7499,7501-7502,7504,7509-7510 via svnmerge from trunk.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/db/models/base.py (modified) (1 diff)
• django/branches/gis/django/db/models/query.py (modified) (4 diffs)
• django/branches/gis/django/db/models/sql/query.py (modified) (2 diffs)
• django/branches/gis/django/db/models/sql/where.py (modified) (1 diff)
• django/branches/gis/docs/db-api.txt (modified) (1 diff)
• django/branches/gis/docs/request_response.txt (modified) (2 diffs)
• django/branches/gis/tests/modeltests/basic/models.py (modified) (1 diff)
• django/branches/gis/tests/regressiontests/queries/models.py (modified) (2 diffs)

django/branches/gis/django/db/models/base.py

@@ -238 +238 @@
-        dispatcher.send(signal=signals.post_init, sender=self.__class__, instance=self)
-
-    def from_sequence(cls, values):
-        """
-        An alternate class constructor, primarily for internal use.
-
-        Creates a model instance from a sequence of values (which corresponds
-        to all the non-many-to-many fields in creation order. If there are more
-        fields than values, the remaining (final) fields are given their
-        default values.
-
-        ForeignKey fields can only be initialised using id values, not
-        instances, in this method.
-        """
-        dispatcher.send(signal=signals.pre_init, sender=cls, args=values,
-                kwargs={})
-        obj = Empty()
-        obj.__class__ = cls
-        field_iter = iter(obj._meta.fields)
-        for val, field in izip(values, field_iter):
-            setattr(obj, field.attname, val)
-        for field in field_iter:
-            setattr(obj, field.attname, field.get_default())
-        dispatcher.send(signal=signals.post_init, sender=cls, instance=obj)
-        return obj
-
-    from_sequence = classmethod(from_sequence)
-
-    def __repr__(self):
-        return smart_str(u'<%s: %s>' % (self.__class__.__name__, unicode(self)))

django/branches/gis/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())
@@ -154 +165 @@
-                        max_depth, requested=requested)
-            else:
-.from_sequence(
+(*
-            for i, k in enumerate(extra_select):
-                setattr(obj, k, row[i])
@@ -645 +656 @@
-    restricted = requested is not None
-    index_end = index_start + len(klass._meta.fields)
-.from_sequence(
+(*
-    for f in klass._meta.fields:
-        if (not f.rel or (not restricted and f.null) or

django/branches/gis/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):
@@ -377 +395 @@
-        """
-        qn = self.quote_name_unless_alias
-
+
+
-        aliases = set(self.extra_select.keys())
-        if with_aliases:

django/branches/gis/django/db/models/sql/where.py

@@ -52 +52 @@
-                elif isinstance(child, tree.Node):
-                    sql, params = self.as_sql(child, qn)
-
+
+
+
-                        format = '%s'
-                    else:
-                        format = '(%s)'
-                    if child.negated:
-                        format = 'NOT %s' % format
-                else:
-                    sql, params = self.make_atom(child, qn)

django/branches/gis/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/gis/docs/request_response.txt

@@ -403 +403 @@
-      object. Doing so will raise ``Exception``.
-
+Setting headers
+~~~~~~~~~~~~~~~
+
+To set a header in your response, just treat it like a dictionary::
+
+    >>> response = HttpResponse()
+    >>> response['Pragma'] = 'no-cache'
+
+Telling the browser to treat the response as a file attachment
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To tell the browser to treat the response as a file attachment, use the
+``mimetype`` argument and set the ``Content-Disposition`` header. For example,
+this is how you might return a Microsoft Excel spreadsheet::
+
+    >>> response = HttpResponse(my_data, mimetype='application/vnd.ms-excel')
+    >>> response['Content-Disposition'] = 'attachment; filename=foo.xls'
+
+There's nothing Django-specific about the ``Content-Disposition`` header, but
+it's easy to forget the syntax, so we've included it here.
+
-Methods
--------
@@ -421 +442 @@
-    header, it can also include the character set encoding, which makes it
-    more than just a MIME type specification. If ``mimetype`` is specified
-None
+``None``
-    neither is given, the ``DEFAULT_CONTENT_TYPE`` setting is used.
-

django/branches/gis/tests/modeltests/basic/models.py

@@ -399 +399 @@
->>> Article.objects.get(headline='Article 11') in s
-True
+
+# The 'select' argument to extra() supports names with dashes in them, as long
+# as you use values().
+>>> Article.objects.filter(pub_date__year=2008).extra(select={'dashed-value': '1'}).values('headline', 'dashed-value')
+[{'headline': u'Article 11', 'dashed-value': 1}, {'headline': u'Article 12', 'dashed-value': 1}]
+
+# If you use 'select' with extra() and names containing dashes on a query
+# that's *not* a values() query, those extra 'select' values will silently be
+# ignored.
+>>> articles = Article.objects.filter(pub_date__year=2008).extra(select={'dashed-value': '1', 'undashedvalue': '2'})
+>>> articles[0].undashedvalue
+2
-"""

django/branches/gis/tests/regressiontests/queries/models.py

@@ -121 +121 @@
-class CustomManager(models.Manager):
-    def get_query_set(self):
-return super(CustomManager, self).get_query_set().filter(public=True,
-       
+qs = super(CustomManager, self).get_query_set()
+return qs.filter(is_public=True,
-
-class ManagedModel(models.Model):
-    data = models.CharField(max_length=10)
-    tag = models.ForeignKey(Tag)
-
+is_
-
-    objects = CustomManager()
@@ -699 +699 @@
-Updates that are filtered on the model being updated are somewhat tricky to get
-in MySQL. This exercises that case.
-
+is_
->>> ManagedModel.objects.update(data='mm')
-