summaryrefslogtreecommitdiff
path: root/docs/db-api.txt
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-10-08 16:10:39 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-10-08 16:10:39 +0000
commit7ebf3068c16d29c0288a317dac45166a8bc4c23c (patch)
tree537b7f487e515d6870e6a61f41588b3d351256f2 /docs/db-api.txt
parent94c320d8a982ce30f6dd4e7556f2696229b761c7 (diff)
queryset-refactor: Merged changed from trunk up to [6463].
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/db-api.txt')
-rw-r--r--docs/db-api.txt7
1 files changed, 1 insertions, 6 deletions
diff --git a/docs/db-api.txt b/docs/db-api.txt
index 61cf2d4ffd..adca8b4d5c 100644
--- a/docs/db-api.txt
+++ b/docs/db-api.txt
@@ -952,7 +952,7 @@ Example::
If you pass ``in_bulk()`` an empty list, you'll get an empty dictionary.
``iterator()``
-~~~~~~~~~~~~
+~~~~~~~~~~~~~~
Evaluates the ``QuerySet`` (by performing the query) and returns an
`iterator`_ over the results. A ``QuerySet`` typically reads all of
@@ -1371,11 +1371,6 @@ equivalent::
Entry.objects.filter(blog__id=3) # __exact is implied
Entry.objects.filter(blog__pk=3) # __pk implies __id__exact
-.. note::
- Because of this shortcut, you cannot have a field in your model called
- ``pk`` that is not the primary key of the model. It will always be
- replaced by the name of the model's primary key in queries.
-
Lookups that span relationships
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~