From e9149d3eb0ed0ddc8b27b1990eb2b7293c1231cd Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Thu, 23 Mar 2017 23:27:13 +0500 Subject: [PATCH] Fixed #27603 -- Fixed AsKML when queryset is evaluated more than once. --- django/contrib/gis/db/models/functions.py | 5 +++-- tests/gis_tests/geoapp/test_functions.py | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/django/contrib/gis/db/models/functions.py b/django/contrib/gis/db/models/functions.py index 01b2c93446e..b688299cb59 100644 --- a/django/contrib/gis/db/models/functions.py +++ b/django/contrib/gis/db/models/functions.py @@ -195,8 +195,9 @@ class AsGML(GeoFunc): class AsKML(AsGML): def as_sqlite(self, compiler, connection): # No version parameter - self.source_expressions.pop(0) - return super().as_sql(compiler, connection) + clone = self.copy() + clone.set_source_expressions(self.get_source_expressions()[1:]) + return clone.as_sql(compiler, connection) class AsSVG(GeoFunc): diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py index ac429dfda94..9896aff5c37 100644 --- a/tests/gis_tests/geoapp/test_functions.py +++ b/tests/gis_tests/geoapp/test_functions.py @@ -118,8 +118,11 @@ class GISFunctionsTests(TestCase): City.objects.annotate(kml=functions.AsKML('name')) # Ensuring the KML is as expected. - ptown = City.objects.annotate(kml=functions.AsKML('point', precision=9)).get(name='Pueblo') + qs = City.objects.annotate(kml=functions.AsKML('point', precision=9)) + ptown = qs.get(name='Pueblo') self.assertEqual('-104.609252,38.255001', ptown.kml) + # Same result if the queryset is evaluated again. + self.assertEqual(qs.get(name='Pueblo').kml, ptown.kml) @skipUnlessDBFeature("has_AsSVG_function") def test_assvg(self):