diff options
Diffstat (limited to 'django/contrib/postgres/fields/array.py')
| -rw-r--r-- | django/contrib/postgres/fields/array.py | 6 |
1 files changed, 5 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): |