summaryrefslogtreecommitdiff
path: root/django/db/backends/sqlite3
diff options
context:
space:
mode:
authorAdam Johnson <me@adamj.eu>2021-12-11 18:21:39 +0000
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-12-13 11:50:45 +0100
commit5111b636d9b63535fa8990142f3b5c756d08c1b6 (patch)
tree18521b776ebfb3bf9abad18c9ec423da064b5549 /django/db/backends/sqlite3
parentc66ecc556883e569fb328b5d7258b17d660c2266 (diff)
Refs #33355 -- Fixed Trunc() with years < 1000 on SQLite.
Thanks to Nick Pope for spotting the bug in Code Review. Co-Authored-By: Nick Pope <nick@nickpope.me.uk>
Diffstat (limited to 'django/db/backends/sqlite3')
-rw-r--r--django/db/backends/sqlite3/base.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py
index 170c0785b9..d87b31055c 100644
--- a/django/db/backends/sqlite3/base.py
+++ b/django/db/backends/sqlite3/base.py
@@ -451,17 +451,17 @@ def _sqlite_date_trunc(lookup_type, dt, tzname, conn_tzname):
if dt is None:
return None
if lookup_type == 'year':
- return "%i-01-01" % dt.year
+ return '%04i-01-01' % dt.year
elif lookup_type == 'quarter':
month_in_quarter = dt.month - (dt.month - 1) % 3
- return '%i-%02i-01' % (dt.year, month_in_quarter)
+ return '%04i-%02i-01' % (dt.year, month_in_quarter)
elif lookup_type == 'month':
- return "%i-%02i-01" % (dt.year, dt.month)
+ return '%04i-%02i-01' % (dt.year, dt.month)
elif lookup_type == 'week':
dt = dt - datetime.timedelta(days=dt.weekday())
- return "%i-%02i-%02i" % (dt.year, dt.month, dt.day)
+ return '%04i-%02i-%02i' % (dt.year, dt.month, dt.day)
elif lookup_type == 'day':
- return "%i-%02i-%02i" % (dt.year, dt.month, dt.day)
+ return '%04i-%02i-%02i' % (dt.year, dt.month, dt.day)
def _sqlite_time_trunc(lookup_type, dt, tzname, conn_tzname):
@@ -520,23 +520,23 @@ def _sqlite_datetime_trunc(lookup_type, dt, tzname, conn_tzname):
if dt is None:
return None
if lookup_type == 'year':
- return "%i-01-01 00:00:00" % dt.year
+ return '%04i-01-01 00:00:00' % dt.year
elif lookup_type == 'quarter':
month_in_quarter = dt.month - (dt.month - 1) % 3
- return '%i-%02i-01 00:00:00' % (dt.year, month_in_quarter)
+ return '%04i-%02i-01 00:00:00' % (dt.year, month_in_quarter)
elif lookup_type == 'month':
- return "%i-%02i-01 00:00:00" % (dt.year, dt.month)
+ return '%04i-%02i-01 00:00:00' % (dt.year, dt.month)
elif lookup_type == 'week':
dt = dt - datetime.timedelta(days=dt.weekday())
- return "%i-%02i-%02i 00:00:00" % (dt.year, dt.month, dt.day)
+ return '%04i-%02i-%02i 00:00:00' % (dt.year, dt.month, dt.day)
elif lookup_type == 'day':
- return "%i-%02i-%02i 00:00:00" % (dt.year, dt.month, dt.day)
+ return '%04i-%02i-%02i 00:00:00' % (dt.year, dt.month, dt.day)
elif lookup_type == 'hour':
- return "%i-%02i-%02i %02i:00:00" % (dt.year, dt.month, dt.day, dt.hour)
+ return '%04i-%02i-%02i %02i:00:00' % (dt.year, dt.month, dt.day, dt.hour)
elif lookup_type == 'minute':
- return "%i-%02i-%02i %02i:%02i:00" % (dt.year, dt.month, dt.day, dt.hour, dt.minute)
+ return '%04i-%02i-%02i %02i:%02i:00' % (dt.year, dt.month, dt.day, dt.hour, dt.minute)
elif lookup_type == 'second':
- return "%i-%02i-%02i %02i:%02i:%02i" % (dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second)
+ return '%04i-%02i-%02i %02i:%02i:%02i' % (dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second)
def _sqlite_time_extract(lookup_type, dt):