diff options
| author | Sigurd Ljødal <sigurd@ljodal.no> | 2017-09-28 22:28:48 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-08-18 13:09:15 -0400 |
| commit | 3e09b37f80ab34cf57e245e1fcdabb3d4ff92a38 (patch) | |
| tree | 7b56c5caeb4d6ebe6b5075c711c36a0572419c6f /django/db/models | |
| parent | c832885a3e8659d4a704bf103d523b610c24e4ec (diff) | |
Fixed #28649 -- Added ExtractIsoYear database function and iso_year lookup.
Diffstat (limited to 'django/db/models')
| -rw-r--r-- | django/db/models/functions/__init__.py | 11 | ||||
| -rw-r--r-- | django/db/models/functions/datetime.py | 12 |
2 files changed, 18 insertions, 5 deletions
diff --git a/django/db/models/functions/__init__.py b/django/db/models/functions/__init__.py index 5f5a8bd1dc..f005546eb0 100644 --- a/django/db/models/functions/__init__.py +++ b/django/db/models/functions/__init__.py @@ -1,9 +1,9 @@ from .comparison import Cast, Coalesce, Greatest, Least from .datetime import ( - Extract, ExtractDay, ExtractHour, ExtractMinute, ExtractMonth, - ExtractQuarter, ExtractSecond, ExtractWeek, ExtractWeekDay, ExtractYear, - Now, Trunc, TruncDate, TruncDay, TruncHour, TruncMinute, TruncMonth, - TruncQuarter, TruncSecond, TruncTime, TruncWeek, TruncYear, + Extract, ExtractDay, ExtractHour, ExtractIsoYear, ExtractMinute, + ExtractMonth, ExtractQuarter, ExtractSecond, ExtractWeek, ExtractWeekDay, + ExtractYear, Now, Trunc, TruncDate, TruncDay, TruncHour, TruncMinute, + TruncMonth, TruncQuarter, TruncSecond, TruncTime, TruncWeek, TruncYear, ) from .math import ( Abs, ACos, ASin, ATan, ATan2, Ceil, Cos, Cot, Degrees, Exp, Floor, Ln, Log, @@ -24,7 +24,8 @@ __all__ = [ # datetime 'Extract', 'ExtractDay', 'ExtractHour', 'ExtractMinute', 'ExtractMonth', 'ExtractQuarter', 'ExtractSecond', 'ExtractWeek', 'ExtractWeekDay', - 'ExtractYear', 'Now', 'Trunc', 'TruncDate', 'TruncDay', 'TruncHour', + 'ExtractIsoYear', 'ExtractYear', 'Now', 'Trunc', 'TruncDate', 'TruncDay', + 'TruncHour', 'TruncMinute', 'TruncMonth', 'TruncQuarter', 'TruncSecond', 'TruncMinute', 'TruncMonth', 'TruncQuarter', 'TruncSecond', 'TruncTime', 'TruncWeek', 'TruncYear', # math diff --git a/django/db/models/functions/datetime.py b/django/db/models/functions/datetime.py index 1876aa7d5c..4d24d2a694 100644 --- a/django/db/models/functions/datetime.py +++ b/django/db/models/functions/datetime.py @@ -80,6 +80,11 @@ class ExtractYear(Extract): lookup_name = 'year' +class ExtractIsoYear(Extract): + """Return the ISO-8601 week-numbering year.""" + lookup_name = 'iso_year' + + class ExtractMonth(Extract): lookup_name = 'month' @@ -126,6 +131,7 @@ DateField.register_lookup(ExtractMonth) DateField.register_lookup(ExtractDay) DateField.register_lookup(ExtractWeekDay) DateField.register_lookup(ExtractWeek) +DateField.register_lookup(ExtractIsoYear) DateField.register_lookup(ExtractQuarter) TimeField.register_lookup(ExtractHour) @@ -142,6 +148,12 @@ ExtractYear.register_lookup(YearGte) ExtractYear.register_lookup(YearLt) ExtractYear.register_lookup(YearLte) +ExtractIsoYear.register_lookup(YearExact) +ExtractIsoYear.register_lookup(YearGt) +ExtractIsoYear.register_lookup(YearGte) +ExtractIsoYear.register_lookup(YearLt) +ExtractIsoYear.register_lookup(YearLte) + class Now(Func): template = 'CURRENT_TIMESTAMP' |