Ticket #13670: 13670.1.patch

django/contrib/gis/db/backends/adapter.py

@@ -8 +8 @@
         self.srid = geom.srid
 
     def __eq__(self, other):
+        if not isinstance(other, WKTAdapter):
+            return False
         return self.wkt == other.wkt and self.srid == other.srid
 
     def __str__(self):

django/contrib/gis/db/backends/postgis/adapter.py

@@ -21 +21 @@
             raise Exception('Error implementing psycopg2 protocol. Is psycopg2 installed?')
 
     def __eq__(self, other):
+        if not isinstance(other, PostGISAdapter):
+            return False
         return (self.ewkb == other.ewkb) and (self.srid == other.srid)
 
     def __str__(self):

django/contrib/gis/tests/geoapp/test_regress.py

@@ -1 +1 @@
 import unittest
 from django.contrib.gis.tests.utils import no_mysql, no_spatialite
 from django.contrib.gis.shortcuts import render_to_kmz
-from models import City
+from models import City, State
 
 class GeoRegressionTests(unittest.TestCase):
 
@@ -35 +35 @@
         extent = City.objects.filter(name='Pueblo').extent()
         for ref_val, val in zip(ref_ext, extent):
             self.assertAlmostEqual(ref_val, val, 4)
+
+    def test04_empty_count(self):
+        "Testing that PostGISAdapter.__eq__ does check empty strings, see #13670"
+        # contrived example, but need a geo lookup paired with an id__in lookup
+        pueblo = City.objects.get(name='Pueblo')
+        state = State.objects.filter(poly__contains=pueblo.point)
+        cities_within_state = City.objects.filter(id__in=state)
+
+        # .count() should not throw TypeError in __eq__
+        self.assertEqual(cities_within_state.count(), 1)