p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #31910 -- Fixed GeoQuerySetTest.test_geoagg_subquery() test on Oracle 18c.

This commit is contained in:
Mariusz Felisiak 2020-11-06 08:48:11 +01:00 committed by GitHub
parent 658bcc16f1
commit 13b6fff117
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -596,12 +596,12 @@ class GeoQuerySetTest(TestCase):
@skipUnlessDBFeature('supports_union_aggr') @skipUnlessDBFeature('supports_union_aggr')
def test_geoagg_subquery(self): def test_geoagg_subquery(self):
ks = State.objects.get(name='Kansas') tx = Country.objects.get(name='Texas')
union = GEOSGeometry('MULTIPOINT(-95.235060 38.971823)') union = GEOSGeometry('MULTIPOINT(-96.801611 32.782057,-95.363151 29.763374)')
# Use distinct() to force the usage of a subquery for aggregation. # Use distinct() to force the usage of a subquery for aggregation.
with CaptureQueriesContext(connection) as ctx: with CaptureQueriesContext(connection) as ctx:
self.assertIs(union.equals( self.assertIs(union.equals(
City.objects.filter(point__within=ks.poly).distinct().aggregate( City.objects.filter(point__within=tx.mpoly).distinct().aggregate(
Union('point'), Union('point'),
)['point__union'], )['point__union'],
), True) ), True)