p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #28815 -- Fixed ExtractYear imports in docs/ref/models/expressions.txt.

This commit is contained in:
Benjamin Bach 2017-11-17 23:30:21 +01:00 committed by Tim Graham
parent 9d1d3b2d2f
commit bf49d9eb0b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/ref/models/expressions.txt
View File

@ -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 For example, to annotate each movie with the average rating for the movies by
the same studio in the same genre and release year:: 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( >>> Movie.objects.annotate(
>>> avg_rating=Window( >>> avg_rating=Window(
>>> expression=Avg('rating'), >>> expression=Avg('rating'),
@ -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 partition and ordering from the previous example is extracted into a dictionary
to reduce repetition:: 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 = { >>> window = {
>>> 'partition': [F('studio'), F('genre')], >>> 'partition': [F('studio'), F('genre')],
>>> 'order_by': ExtractYear('released').asc(), >>> 'order_by': ExtractYear('released').asc(),
@ -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 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:: 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( >>> Movie.objects.annotate(
>>> avg_rating=Window( >>> avg_rating=Window(
>>> expression=Avg('rating'), >>> expression=Avg('rating'),