diff options
| author | Antoine Catton <acatton@fusionbox.com> | 2015-10-05 14:13:14 -0600 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-10-14 11:24:12 -0700 |
| commit | 36e7d275ec1a65c9378ba29d4be005deb5703889 (patch) | |
| tree | 8b8ef32f4497c6b249901300cdbbed97af0f158b | |
| parent | 38d6e1e2ada93e5d8c672ba18f1f8e3cd6c5ca76 (diff) | |
[1.9.x] Fixed #25506 -- Allowed filtering over a RawSQL annotation.
Co-Authored-By: Gavin Wahl <gwahl@fusionbox.com>
Backport of b971c1cd78a0bf831c1c30080089c4a384d037a0 from master
| -rw-r--r-- | django/db/models/lookups.py | 2 | ||||
| -rw-r--r-- | docs/releases/1.8.6.txt | 2 | ||||
| -rw-r--r-- | tests/expressions/tests.py | 12 |
3 files changed, 15 insertions, 1 deletions
diff --git a/django/db/models/lookups.py b/django/db/models/lookups.py index 93053c8160..b50711ada4 100644 --- a/django/db/models/lookups.py +++ b/django/db/models/lookups.py @@ -151,7 +151,7 @@ class BuiltinLookup(Lookup): lhs_sql = connection.ops.field_cast_sql( db_type, field_internal_type) % lhs_sql lhs_sql = connection.ops.lookup_cast(self.lookup_name, field_internal_type) % lhs_sql - return lhs_sql, params + return lhs_sql, list(params) def as_sql(self, compiler, connection): lhs_sql, params = self.process_lhs(compiler, connection) diff --git a/docs/releases/1.8.6.txt b/docs/releases/1.8.6.txt index b972ee0148..4e455d7672 100644 --- a/docs/releases/1.8.6.txt +++ b/docs/releases/1.8.6.txt @@ -17,3 +17,5 @@ Bugfixes * Fixed system check crash on ``ForeignKey`` to abstract model (:ticket:`25503`). + +* Allowed filtering over a ``RawSQL`` annotation (:ticket:`25506`). diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py index 1af0b6e7a2..f68892782f 100644 --- a/tests/expressions/tests.py +++ b/tests/expressions/tests.py @@ -57,6 +57,18 @@ class BasicExpressionsTests(TestCase): ) self.assertEqual(companies['result'], 2395) + def test_annotate_values_filter(self): + companies = Company.objects.annotate( + foo=RawSQL('%s', ['value']), + ).filter(foo='value').order_by('name') + self.assertQuerysetEqual( + companies, [ + '<Company: Example Inc.>', + '<Company: Foobar Ltd.>', + '<Company: Test GmbH>', + ], + ) + def test_filter_inter_attribute(self): # We can filter on attribute relationships on same model obj, e.g. # find companies where the number of employees is greater |