mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-08 19:09:15 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #31002 -- Fixed GIS lookups crash against a subquery annotation.

Browse Source 
Thanks Vasileios Bouzas for the report.
This commit is contained in:
Simon Charette 2019-11-24 10:21:32 -05:00 committed by Mariusz Felisiak
parent 29d8198841
commit 0290e01d5a
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/gis/db/backends/oracle/operations.py
View File

@ -45,8 +45,8 @@ class SDORelate(SpatialOperator):
raise ValueError('Invalid SDO_RELATE mask: "%s"' % arg) raise ValueError('Invalid SDO_RELATE mask: "%s"' % arg)
def as_sql(self, connection, lookup, template_params, sql_params): def as_sql(self, connection, lookup, template_params, sql_params):
template_params['mask'] = sql_params.pop() template_params['mask'] = sql_params[-1]
return super().as_sql(connection, lookup, template_params, sql_params) return super().as_sql(connection, lookup, template_params, sql_params[:-1])
class OracleOperations(BaseSpatialOperations, DatabaseOperations): class OracleOperations(BaseSpatialOperations, DatabaseOperations):

4
django/contrib/gis/db/models/lookups.py
View File

@ -75,9 +75,9 @@ class GISLookup(Lookup):
return connection.ops.gis_operators[self.lookup_name] return connection.ops.gis_operators[self.lookup_name]
def as_sql(self, compiler, connection): def as_sql(self, compiler, connection):
lhs_sql, sql_params = self.process_lhs(compiler, connection) lhs_sql, lhs_params = self.process_lhs(compiler, connection)
rhs_sql, rhs_params = self.process_rhs(compiler, connection) rhs_sql, rhs_params = self.process_rhs(compiler, connection)
sql_params.extend(rhs_params) sql_params = (*lhs_params, *rhs_params)
template_params = {'lhs': lhs_sql, 'rhs': rhs_sql, 'value': '%s', **self.template_params} template_params = {'lhs': lhs_sql, 'rhs': rhs_sql, 'value': '%s', **self.template_params}
rhs_op = self.get_rhs_op(connection, rhs_sql) rhs_op = self.get_rhs_op(connection, rhs_sql)

20
tests/gis_tests/geoapp/tests.py
View File

@ -10,6 +10,7 @@ from django.contrib.gis.geos import (
) )
from django.core.management import call_command from django.core.management import call_command
from django.db import NotSupportedError, connection from django.db import NotSupportedError, connection
from django.db.models import F, OuterRef, Subquery
from django.test import TestCase, skipUnlessDBFeature from django.test import TestCase, skipUnlessDBFeature
from ..utils import ( from ..utils import (
@ -17,8 +18,8 @@ from ..utils import (
spatialite, spatialite,
) )
from .models import ( from .models import (
City, Country, Feature, MinusOneSRID, NonConcreteModel, PennsylvaniaCity, City, Country, Feature, MinusOneSRID, MultiFields, NonConcreteModel,
State, Track, PennsylvaniaCity, State, Track,
) )
@ -494,6 +495,21 @@ class GeoLookupTest(TestCase):
with self.subTest(lookup): with self.subTest(lookup):
City.objects.filter(**{'point__' + lookup: functions.Union('point', 'point')}).exists() City.objects.filter(**{'point__' + lookup: functions.Union('point', 'point')}).exists()
def test_subquery_annotation(self):
multifields = MultiFields.objects.create(
city=City.objects.create(point=Point(1, 1)),
point=Point(2, 2),
poly=Polygon.from_bbox((0, 0, 2, 2)),
)
qs = MultiFields.objects.annotate(
city_point=Subquery(City.objects.filter(
id=OuterRef('city'),
).values('point')),
).filter(
city_point__within=F('poly'),
)
self.assertEqual(qs.get(), multifields)
class GeoQuerySetTest(TestCase): class GeoQuerySetTest(TestCase):
# TODO: GeoQuerySet is removed, organize these test better. # TODO: GeoQuerySet is removed, organize these test better.