Skip to content

Commit

Permalink
Fixed #28815 -- Fixed ExtractYear imports in docs/ref/models/expressi…
Browse files Browse the repository at this point in the history
…ons.txt.
  • Loading branch information
benjaoming authored and timgraham committed Nov 17, 2017
1 parent 9d1d3b2 commit bf49d9e
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions docs/ref/models/expressions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,8 @@ computation. See :ref:`window-frames` for details.
For example, to annotate each movie with the average rating for the movies by
the same studio in the same genre and release year::

>>> from django.db.models import Avg, ExtractYear, F, Window
>>> from django.db.models import Avg, F, Window
>>> from django.db.models.functions import ExtractYear
>>> Movie.objects.annotate(
>>> avg_rating=Window(
>>> expression=Avg('rating'),
Expand All @@ -739,7 +740,8 @@ genre, and release year) by using three window functions in the same query. The
partition and ordering from the previous example is extracted into a dictionary
to reduce repetition::

>>> from django.db.models import Avg, ExtractYear, F, Max, Min, Window
>>> from django.db.models import Avg, F, Max, Min, Window
>>> from django.db.models.functions import ExtractYear
>>> window = {
>>> 'partition': [F('studio'), F('genre')],
>>> 'order_by': ExtractYear('released').asc(),
Expand Down Expand Up @@ -820,7 +822,8 @@ If a movie's "peers" are described as movies released by the same studio in the
same genre in the same year, this ``RowRange`` example annotates each movie
with the average rating of a movie's two prior and two following peers::

>>> from django.db.models import Avg, ExtractYear, F, RowRange, Window
>>> from django.db.models import Avg, F, RowRange, Window
>>> from django.db.models.functions import ExtractYear
>>> Movie.objects.annotate(
>>> avg_rating=Window(
>>> expression=Avg('rating'),
Expand Down

0 comments on commit bf49d9e

Please sign in to comment.