diff options
| author | Attila Tovt <uran198@gmail.com> | 2015-11-22 02:59:37 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-11-25 16:53:27 -0500 |
| commit | 3ec4e739dd4ac3f1dea92cdec858bf491f63d5e8 (patch) | |
| tree | 40a2114d70fad9750d2f9af1b75089c5dd9c190b | |
| parent | 78627091f890061831f29085c5c5b47036be5cc6 (diff) | |
[1.8.x] Fixed #25772 -- Corrected __len lookup on ArrayField for empty arrays.
Backport of 88fc9e2826044110b7b22577a227f122fe9c1fb5 from master
| -rw-r--r-- | django/contrib/postgres/fields/array.py | 6 | ||||
| -rw-r--r-- | docs/releases/1.8.8.txt | 3 | ||||
| -rw-r--r-- | tests/postgres_tests/test_array.py | 7 |
3 files changed, 15 insertions, 1 deletions
diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py index 87760613fb..ceac798604 100644 --- a/django/contrib/postgres/fields/array.py +++ b/django/contrib/postgres/fields/array.py @@ -198,7 +198,11 @@ class ArrayLenTransform(Transform): def as_sql(self, compiler, connection): lhs, params = compiler.compile(self.lhs) - return 'array_length(%s, 1)' % lhs, params + # Distinguish NULL and empty arrays + return ( + 'CASE WHEN %(lhs)s IS NULL THEN NULL ELSE ' + 'coalesce(array_length(%(lhs)s, 1), 0) END' + ) % {'lhs': lhs}, params class IndexTransform(Transform): diff --git a/docs/releases/1.8.8.txt b/docs/releases/1.8.8.txt index 1c4b659782..1a28efe167 100644 --- a/docs/releases/1.8.8.txt +++ b/docs/releases/1.8.8.txt @@ -11,3 +11,6 @@ Bugfixes * Fixed incorrect ``unique_together`` field name generation by ``inspectdb`` (:ticket:`25274`). + +* Corrected ``__len`` query lookup on ``ArrayField`` for empty arrays + (:ticket:`25772`). diff --git a/tests/postgres_tests/test_array.py b/tests/postgres_tests/test_array.py index fb7eb16da2..b514a4329e 100644 --- a/tests/postgres_tests/test_array.py +++ b/tests/postgres_tests/test_array.py @@ -218,6 +218,13 @@ class TestQuerying(TestCase): self.objs[0:3] ) + def test_len_empty_array(self): + obj = NullableIntegerArrayModel.objects.create(field=[]) + self.assertSequenceEqual( + NullableIntegerArrayModel.objects.filter(field__len=0), + [obj] + ) + def test_slice(self): self.assertSequenceEqual( NullableIntegerArrayModel.objects.filter(field__0_1=[2]), |