diff options
| author | toan <toan.vuong@hyperscience.com> | 2023-09-21 15:51:45 -0700 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-09-22 10:09:19 +0200 |
| commit | dcd3a0316bed8605c0464793cd7ca73027eaa780 (patch) | |
| tree | e180b4f12c82628eec99ff78d90f1ffc64287fe0 /django | |
| parent | 88992c5ac62f4170bc502adb8a9d7304ce6dccc3 (diff) | |
[5.0.x] Fixed #34858 -- Corrected resolving output_field for PositiveIntegerField.
Regression in 40b8a6174f001a310aa33f7880db0efeeb04d4c4.
Backport of 4de31ec680df062e5964b630f1b881ead5004e15 from main
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/expressions.py | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index 4ea179ecde..30d44650ec 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -512,6 +512,25 @@ class Expression(BaseExpression, Combinable): _connector_combinations = [ # Numeric operations - operands of same type. + # PositiveIntegerField should take precedence over IntegerField (except + # subtraction). + { + connector: [ + ( + fields.PositiveIntegerField, + fields.PositiveIntegerField, + fields.PositiveIntegerField, + ), + ] + for connector in ( + Combinable.ADD, + Combinable.MUL, + Combinable.DIV, + Combinable.MOD, + Combinable.POW, + ) + }, + # Other numeric operands. { connector: [ (fields.IntegerField, fields.IntegerField, fields.IntegerField), |