mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-31 19:46:42 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #33229 -- Fixed BaseDatabaseOperations.adapt_datetimefield_value()/adapt_timefield_value() crash with expressions.

Browse Source
This commit is contained in:
SwastikTripathi 2021-11-12 22:23:25 +05:30 committed by Mariusz Felisiak
parent 6fa2930573
commit a7e7043c87
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/db/backends/base/operations.py
View File

@ -505,6 +505,10 @@ class BaseDatabaseOperations:
""" """
if value is None: if value is None:
return None return None
# Expression values are adapted by the database.
if hasattr(value, 'resolve_expression'):
return value
return str(value) return str(value)
def adapt_timefield_value(self, value): def adapt_timefield_value(self, value):
@ -514,6 +518,10 @@ class BaseDatabaseOperations:
""" """
if value is None: if value is None:
return None return None
# Expression values are adapted by the database.
if hasattr(value, 'resolve_expression'):
return value
if timezone.is_aware(value): if timezone.is_aware(value):
raise ValueError("Django does not support timezone-aware times.") raise ValueError("Django does not support timezone-aware times.")
return str(value) return str(value)

12
tests/backends/base/test_operations.py
View File

@ -3,7 +3,7 @@ import decimal
from django.core.management.color import no_style from django.core.management.color import no_style
from django.db import NotSupportedError, connection, transaction from django.db import NotSupportedError, connection, transaction
from django.db.backends.base.operations import BaseDatabaseOperations from django.db.backends.base.operations import BaseDatabaseOperations
from django.db.models import DurationField from django.db.models import DurationField, Value
from django.test import ( from django.test import (
SimpleTestCase, TestCase, TransactionTestCase, override_settings, SimpleTestCase, TestCase, TransactionTestCase, override_settings,
skipIfDBFeature, skipIfDBFeature,
@ -72,9 +72,17 @@ class SimpleDatabaseOperationTests(SimpleTestCase):
def test_adapt_timefield_value_none(self): def test_adapt_timefield_value_none(self):
self.assertIsNone(self.ops.adapt_timefield_value(None)) self.assertIsNone(self.ops.adapt_timefield_value(None))
def test_adapt_datetimefield_value(self): def test_adapt_timefield_value_expression(self):
value = Value(timezone.now().time())
self.assertEqual(self.ops.adapt_timefield_value(value), value)
def test_adapt_datetimefield_value_none(self):
self.assertIsNone(self.ops.adapt_datetimefield_value(None)) self.assertIsNone(self.ops.adapt_datetimefield_value(None))
def test_adapt_datetimefield_value_expression(self):
value = Value(timezone.now())
self.assertEqual(self.ops.adapt_datetimefield_value(value), value)
def test_adapt_timefield_value(self): def test_adapt_timefield_value(self):
msg = 'Django does not support timezone-aware times.' msg = 'Django does not support timezone-aware times.'
with self.assertRaisesMessage(ValueError, msg): with self.assertRaisesMessage(ValueError, msg):