Context Navigation

Ticket #16408: 16408-4.diff

File 16408-4.diff, 1.7 KB (added by Claude Paroz, 12 years ago)
Call parent convert_values

diff --git a/django/contrib/gis/db/models/sql/query.py b/django/contrib/gis/db/models/sql/query.py
index 3b8245e..8f78f2b 100644

                class GeoQuery(sql.Query):
             value = Area(**{field.area_att : value})
         elif isinstance(field, (GeomField, GeometryField)) and value:
             value = Geometry(value)
+        else:
+            return super(GeoQuery, self).convert_values(value, field, connection)
         return value
     def get_aggregation(self, using):

diff --git a/django/contrib/gis/tests/geoapp/test_regress.py b/django/contrib/gis/tests/geoapp/test_regress.py
index 0e9c5c4..15e8555 100644

                from datetime import datetime
 from django.contrib.gis.tests.utils import no_mysql, no_spatialite
 from django.contrib.gis.shortcuts import render_to_kmz
 from django.db.models import Count
+from django.db.models import Count, Min
 from django.test import TestCase
 from .models import City, PennsylvaniaCity, State, Truth
-…
+               class GeoRegressionTests(TestCase):
         mansfield = PennsylvaniaCity.objects.create(name='Mansfield', county='Tioga', point='POINT(-77.071445 41.823881)',
                                                     founded=founded)
         self.assertEqual(founded, PennsylvaniaCity.objects.dates('founded', 'day')[0])
+        self.assertEqual(founded, PennsylvaniaCity.objects.aggregate(Min('founded'))['founded__min'])
     def test_empty_count(self):
          "Testing that PostGISAdapter.__eq__ does check empty strings. See #13670."