diff options
| author | Dmitry Dygalo <d.dygalo@volsor.com> | 2015-11-07 13:52:40 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-11-14 11:24:21 -0500 |
| commit | e9c9f2ed82bd59b211f5f449730ad1299cfdd3c1 (patch) | |
| tree | 9d004f07e8c15e5f5d2bdf65f8eb90a45b23adda /django | |
| parent | 3b73a9c982d18012f4e9847950733730843fe59c (diff) | |
[1.8.x] Fixed #25666 -- Fixed the exact lookup of ArrayField.
Backport of 263b3d2ba132ea443193dc0b728741317742c8d3 from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/postgres/fields/array.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py index 5d49d49e22..87760613fb 100644 --- a/django/contrib/postgres/fields/array.py +++ b/django/contrib/postgres/fields/array.py @@ -5,6 +5,7 @@ from django.contrib.postgres.forms import SimpleArrayField from django.contrib.postgres.validators import ArrayMaxLengthValidator from django.core import checks, exceptions from django.db.models import Field, IntegerField, Transform +from django.db.models.lookups import Exact from django.utils import six from django.utils.translation import string_concat, ugettext_lazy as _ @@ -162,7 +163,7 @@ class ArrayField(Field): class ArrayContains(lookups.DataContains): def as_sql(self, qn, connection): sql, params = super(ArrayContains, self).as_sql(qn, connection) - sql += '::%s' % self.lhs.output_field.db_type(connection) + sql = '%s::%s' % (sql, self.lhs.output_field.db_type(connection)) return sql, params @@ -170,7 +171,15 @@ class ArrayContains(lookups.DataContains): class ArrayContainedBy(lookups.ContainedBy): def as_sql(self, qn, connection): sql, params = super(ArrayContainedBy, self).as_sql(qn, connection) - sql += '::%s' % self.lhs.output_field.db_type(connection) + sql = '%s::%s' % (sql, self.lhs.output_field.db_type(connection)) + return sql, params + + +@ArrayField.register_lookup +class ArrayExact(Exact): + def as_sql(self, qn, connection): + sql, params = super(ArrayExact, self).as_sql(qn, connection) + sql = '%s::%s' % (sql, self.lhs.output_field.db_type(connection)) return sql, params @@ -178,7 +187,7 @@ class ArrayContainedBy(lookups.ContainedBy): class ArrayOverlap(lookups.Overlap): def as_sql(self, qn, connection): sql, params = super(ArrayOverlap, self).as_sql(qn, connection) - sql += '::%s' % self.lhs.output_field.db_type(connection) + sql = '%s::%s' % (sql, self.lhs.output_field.db_type(connection)) return sql, params |
