Skip to content

Commit

Permalink
Fixed #16408 -- Re-fixed value conversion with Spatialite backend
Browse files Browse the repository at this point in the history
  • Loading branch information
claudep committed Dec 26, 2012
1 parent 9c5a6ad commit 0907d3c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions django/contrib/gis/db/models/sql/query.py
Expand Up @@ -72,6 +72,8 @@ def convert_values(self, value, field, connection):
value = Area(**{field.area_att : value})
elif isinstance(field, (GeomField, GeometryField)) and value:
value = Geometry(value)
elif field is not None:
return super(GeoQuery, self).convert_values(value, field, connection)
return value

def get_aggregation(self, using):
Expand Down
3 changes: 2 additions & 1 deletion django/contrib/gis/tests/geoapp/test_regress.py
Expand Up @@ -5,7 +5,7 @@

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
Expand Down Expand Up @@ -50,6 +50,7 @@ def test_unicode_date(self):
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."
Expand Down

0 comments on commit 0907d3c

Please sign in to comment.