From 13b6fff11703a694e155b84d41d02822bbc0aaa0 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Fri, 6 Nov 2020 08:48:11 +0100 Subject: [PATCH] Refs #31910 -- Fixed GeoQuerySetTest.test_geoagg_subquery() test on Oracle 18c. --- tests/gis_tests/geoapp/tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/gis_tests/geoapp/tests.py b/tests/gis_tests/geoapp/tests.py index 8dfe3d02a1e..607db43d4a7 100644 --- a/tests/gis_tests/geoapp/tests.py +++ b/tests/gis_tests/geoapp/tests.py @@ -596,12 +596,12 @@ class GeoQuerySetTest(TestCase): @skipUnlessDBFeature('supports_union_aggr') def test_geoagg_subquery(self): - ks = State.objects.get(name='Kansas') - union = GEOSGeometry('MULTIPOINT(-95.235060 38.971823)') + tx = Country.objects.get(name='Texas') + union = GEOSGeometry('MULTIPOINT(-96.801611 32.782057,-95.363151 29.763374)') # Use distinct() to force the usage of a subquery for aggregation. with CaptureQueriesContext(connection) as ctx: self.assertIs(union.equals( - City.objects.filter(point__within=ks.poly).distinct().aggregate( + City.objects.filter(point__within=tx.mpoly).distinct().aggregate( Union('point'), )['point__union'], ), True)