diff options
| author | David Sanders <shang.xiao.sanders@gmail.com> | 2024-08-05 08:20:48 +0200 |
|---|---|---|
| committer | Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> | 2024-08-05 17:35:51 +0200 |
| commit | 78654a29b851751f347d51dbfe5ba8a996c012ba (patch) | |
| tree | 4dd7cbb8df9ef29289321ef6e79fcc9ed8de3b27 | |
| parent | 20bd3f02becc8c8657a23f058b82e8708e9336cc (diff) | |
[5.1.x] Refs #35638 -- Avoided wrapping expressions with Value in _get_field_value_map() and renamed to _get_field_expression_map().
Backport of 91a038754bb516d29cb79f0fed4025436b5c5346 from main.
| -rw-r--r-- | django/contrib/postgres/constraints.py | 2 | ||||
| -rw-r--r-- | django/db/models/base.py | 9 | ||||
| -rw-r--r-- | django/db/models/constraints.py | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/django/contrib/postgres/constraints.py b/django/contrib/postgres/constraints.py index a31f657183..0dcb5adaf6 100644 --- a/django/contrib/postgres/constraints.py +++ b/django/contrib/postgres/constraints.py @@ -190,7 +190,7 @@ class ExclusionConstraint(BaseConstraint): def validate(self, model, instance, exclude=None, using=DEFAULT_DB_ALIAS): queryset = model._default_manager.using(using) - replacement_map = instance._get_field_value_map( + replacement_map = instance._get_field_expression_map( meta=model._meta, exclude=exclude ) replacements = {F(field): value for field, value in replacement_map.items()} diff --git a/django/db/models/base.py b/django/db/models/base.py index b118b675cc..ddf3337f91 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -1333,12 +1333,17 @@ class Model(AltersData, metaclass=ModelBase): setattr(self, cachename, obj) return getattr(self, cachename) - def _get_field_value_map(self, meta, exclude=None): + def _get_field_expression_map(self, meta, exclude=None): if exclude is None: exclude = set() meta = meta or self._meta field_map = { - field.name: Value(getattr(self, field.attname), field) + field.name: ( + value + if (value := getattr(self, field.attname)) + and hasattr(value, "resolve_expression") + else Value(value, field) + ) for field in meta.local_concrete_fields if field.name not in exclude and not field.generated } diff --git a/django/db/models/constraints.py b/django/db/models/constraints.py index 0a63e38d83..915ace5129 100644 --- a/django/db/models/constraints.py +++ b/django/db/models/constraints.py @@ -241,7 +241,7 @@ class CheckConstraint(BaseConstraint): return schema_editor._delete_check_sql(model, self.name) def validate(self, model, instance, exclude=None, using=DEFAULT_DB_ALIAS): - against = instance._get_field_value_map(meta=model._meta, exclude=exclude) + against = instance._get_field_expression_map(meta=model._meta, exclude=exclude) try: if not Q(self.condition).check(against, using=using): raise ValidationError( @@ -638,7 +638,7 @@ class UniqueConstraint(BaseConstraint): return replacements = { F(field): value - for field, value in instance._get_field_value_map( + for field, value in instance._get_field_expression_map( meta=model._meta, exclude=exclude ).items() } @@ -668,7 +668,9 @@ class UniqueConstraint(BaseConstraint): code=self.violation_error_code, ) else: - against = instance._get_field_value_map(meta=model._meta, exclude=exclude) + against = instance._get_field_expression_map( + meta=model._meta, exclude=exclude + ) try: if (self.condition & Exists(queryset.filter(self.condition))).check( against, using=using |