Ticket #10594: fix_null_geometry_querysets_with_tests.diff

django/contrib/gis/db/models/sql/query.py

@@ -233 +233 @@
         extra selection objects into Geometry and Distance objects.
         TODO: Make converted objects 'lazy' for less overhead.
         """
+        if value == None:
+            return value
+
         if SpatialBackend.oracle:
             # Running through Oracle's first.
             value = super(GeoQuery, self).convert_values(value, field or GeomField())

django/contrib/gis/tests/distapp/tests.py

@@ -8 +8 @@
 from django.contrib.gis.tests.utils import oracle, postgis, spatialite, no_oracle, no_spatialite
 
 from models import AustraliaCity, Interstate, SouthTexasInterstate, \
-    SouthTexasCity, SouthTexasCityFt, CensusZipcode, SouthTexasZipcode
+    SouthTexasCity, SouthTexasCityFt, CensusZipcode, SouthTexasZipcode, NullPointModel
 from data import au_cities, interstates, stx_interstates, stx_cities, stx_zips
 
 class DistanceTest(unittest.TestCase):
@@ -203 +203 @@
             for i, z in enumerate(qs):
                 self.assertAlmostEqual(z.distance.m, dists_m[i], 5)
 
+    def test03d_distance_method(self):
+        "Testing the `distance` GeoQuerySet method with null geometries in models"
+        # Ensure that null geometry fields in distance method lookups don't kill the
+        # querysets (ticket #10594)
+        null = NullPointModel.objects.create(name="Null")
+        notnull = NullPointModel.objects.create(name="Not null", point=Point(0, 0))
+        qs = NullPointModel.objects.distance(Point(0, 0))
+        self.assertTrue(null in qs)
+        self.assertTrue(notnull in qs)
+        for obj in qs:
+            if obj.name == "Null":
+                self.assertEquals(obj.distance, None)
+            elif obj.name == "Not null":
+                self.assertEquals(obj.distance.m, 0)
+
     def test04_distance_lookups(self):
         "Testing the `distance_lt`, `distance_gt`, `distance_lte`, and `distance_gte` lookup types."
         # Retrieving the cities within a 20km 'donut' w/a 7km radius 'hole'

django/contrib/gis/tests/distapp/models.py

@@ -47 +47 @@
     path = models.LineStringField(srid=32140)
     objects = models.GeoManager()
     def __unicode__(self): return self.name
+
+class NullPointModel(models.Model):
+    name = models.CharField(max_length=30)
+    point = models.PointField(null=True)
+    objects = models.GeoManager()
+    def __unicode__(self): return self.name