Skip to content

Commit

Permalink
Fixed #12997 -- Added markup for methods in the queryset docs. Thanks…
Browse files Browse the repository at this point in the history
… to Ramiro Morales for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
freakboy3742 committed May 9, 2010
1 parent 5802ea3 commit 55d65d3
Showing 1 changed file with 53 additions and 3 deletions.
56 changes: 53 additions & 3 deletions docs/ref/models/querysets.txt
Expand Up @@ -138,6 +138,8 @@ executed.
``filter(**kwargs)``
~~~~~~~~~~~~~~~~~~~~

.. method:: filter(**kwargs)

Returns a new ``QuerySet`` containing objects that match the given lookup
parameters.

Expand All @@ -148,6 +150,8 @@ underlying SQL statement.
``exclude(**kwargs)``
~~~~~~~~~~~~~~~~~~~~~

.. method:: exclude(**kwargs)

Returns a new ``QuerySet`` containing objects that do *not* match the given
lookup parameters.

Expand Down Expand Up @@ -181,6 +185,8 @@ Note the second example is more restrictive.
``annotate(*args, **kwargs)``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. method:: annotate(*args, **kwargs)

.. versionadded:: 1.1

Annotates each object in the ``QuerySet`` with the provided list of
Expand Down Expand Up @@ -223,6 +229,8 @@ Aggregation <topics-db-aggregation>`.
``order_by(*fields)``
~~~~~~~~~~~~~~~~~~~~~

.. method:: order_by(*fields)

By default, results returned by a ``QuerySet`` are ordered by the ordering
tuple given by the ``ordering`` option in the model's ``Meta``. You can
override this on a per-``QuerySet`` basis by using the ``order_by`` method.
Expand Down Expand Up @@ -297,6 +305,8 @@ You can tell if a query is ordered or not by checking the
``reverse()``
~~~~~~~~~~~~~

.. method:: reverse()

.. versionadded:: 1.0

Use the ``reverse()`` method to reverse the order in which a queryset's
Expand Down Expand Up @@ -327,6 +337,8 @@ undefined afterward).
``distinct()``
~~~~~~~~~~~~~~

.. method:: distinct()

Returns a new ``QuerySet`` that uses ``SELECT DISTINCT`` in its SQL query. This
eliminates duplicate rows from the query results.

Expand Down Expand Up @@ -361,6 +373,8 @@ query spans multiple tables, it's possible to get duplicate results when a
``values(*fields)``
~~~~~~~~~~~~~~~~~~~

.. method:: values(*fields)

Returns a ``ValuesQuerySet`` -- a ``QuerySet`` that returns dictionaries when
used as an iterable, rather than model-instance objects.

Expand Down Expand Up @@ -449,6 +463,8 @@ individualism.
``values_list(*fields)``
~~~~~~~~~~~~~~~~~~~~~~~~

.. method:: values_list(*fields)

.. versionadded:: 1.0

This is similar to ``values()`` except that instead of returning dictionaries,
Expand Down Expand Up @@ -477,6 +493,8 @@ fields in the model, in the order they were declared.
``dates(field, kind, order='ASC')``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. method:: dates(field, kind, order='ASC')

Returns a ``DateQuerySet`` -- a ``QuerySet`` that evaluates to a list of
``datetime.datetime`` objects representing all available dates of a particular
kind within the contents of the ``QuerySet``.
Expand Down Expand Up @@ -511,6 +529,8 @@ Examples::
``none()``
~~~~~~~~~~

.. method:: none()

.. versionadded:: 1.0

Returns an ``EmptyQuerySet`` -- a ``QuerySet`` that always evaluates to
Expand All @@ -524,7 +544,9 @@ Examples::
[]

``all()``
~~~~~~~~~~
~~~~~~~~~

.. method:: all()

.. versionadded:: 1.0

Expand All @@ -539,6 +561,8 @@ definitely have a ``QuerySet`` to work with.
``select_related()``
~~~~~~~~~~~~~~~~~~~~

.. method:: select_related()

Returns a ``QuerySet`` that will automatically "follow" foreign-key
relationships, selecting that additional related-object data when it executes
its query. This is a performance booster which results in (sometimes much)
Expand Down Expand Up @@ -660,6 +684,8 @@ are performing a depth-based ``select_related``.
``extra(select=None, where=None, params=None, tables=None, order_by=None, select_params=None)``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. method:: extra(select=None, where=None, params=None, tables=None, order_by=None, select_params=None)

Sometimes, the Django query syntax by itself can't easily express a complex
``WHERE`` clause. For these edge cases, Django provides the ``extra()``
``QuerySet`` modifier -- a hook for injecting specific clauses into the SQL
Expand Down Expand Up @@ -822,6 +848,8 @@ of the arguments is required, but you should use at least one of them.
``defer(*fields)``
~~~~~~~~~~~~~~~~~~

.. method:: defer(*fields)

.. versionadded:: 1.1

In some complex data-modeling situations, your models might contain a lot of
Expand Down Expand Up @@ -878,7 +906,9 @@ eventually).
settled down and you understand where the hot-points are.

``only(*fields)``
~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~

.. method:: only(*fields)

.. versionadded:: 1.1

Expand Down Expand Up @@ -914,7 +944,9 @@ logically::
Entry.objects.defer("body").only("headline", "body")

``using(alias)``
~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~

.. method:: using(alias)

.. versionadded:: 1.2

Expand Down Expand Up @@ -946,6 +978,8 @@ they query the database each time they're called.
``get(**kwargs)``
~~~~~~~~~~~~~~~~~

.. method:: get(**kwargs)

Returns the object matching the given lookup parameters, which should be in
the format described in `Field lookups`_.

Expand Down Expand Up @@ -973,6 +1007,8 @@ The ``DoesNotExist`` exception inherits from
``create(**kwargs)``
~~~~~~~~~~~~~~~~~~~~

.. method:: create(**kwargs)

A convenience method for creating an object and saving it all in one step. Thus::

p = Person.objects.create(first_name="Bruce", last_name="Springsteen")
Expand All @@ -995,6 +1031,8 @@ exception if you are using manual primary keys.
``get_or_create(**kwargs)``
~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. method:: get_or_create(**kwargs)

A convenience method for looking up an object with the given kwargs, creating
one if necessary.

Expand Down Expand Up @@ -1063,6 +1101,8 @@ has a side effect on your data. For more, see `Safe methods`_ in the HTTP spec.
``count()``
~~~~~~~~~~~

.. method:: count()

Returns an integer representing the number of objects in the database matching
the ``QuerySet``. ``count()`` never raises exceptions.

Expand All @@ -1087,6 +1127,8 @@ problems.
``in_bulk(id_list)``
~~~~~~~~~~~~~~~~~~~~

.. method:: in_bulk(id_list)

Takes a list of primary-key values and returns a dictionary mapping each
primary-key value to an instance of the object with the given ID.

Expand All @@ -1106,6 +1148,8 @@ If you pass ``in_bulk()`` an empty list, you'll get an empty dictionary.
``iterator()``
~~~~~~~~~~~~~~

.. method:: iterator()

Evaluates the ``QuerySet`` (by performing the query) and returns an
`iterator`_ over the results. A ``QuerySet`` typically caches its
results internally so that repeated evaluations do not result in
Expand All @@ -1122,6 +1166,8 @@ been evaluated will force it to evaluate again, repeating the query.
``latest(field_name=None)``
~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. method:: latest(field_name=None)

Returns the latest object in the table, by date, using the ``field_name``
provided as the date field.

Expand All @@ -1142,6 +1188,8 @@ Note ``latest()`` exists purely for convenience and readability.
``aggregate(*args, **kwargs)``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. method:: aggregate(*args, **kwargs)

.. versionadded:: 1.1

Returns a dictionary of aggregate values (averages, sums, etc) calculated
Expand Down Expand Up @@ -1174,6 +1222,8 @@ Aggregation <topics-db-aggregation>`.
``exists()``
~~~~~~~~~~~~

.. method:: exists()

.. versionadded:: 1.2

Returns ``True`` if the :class:`QuerySet` contains any results, and ``False``
Expand Down

0 comments on commit 55d65d3

Please sign in to comment.