[1.10.x] Fixed #26785 -- Made Oracle return None rather than empty string for empty geometries.

Backport of ea4665066b651e0e2730f2e2d85fcef9d7ac7966 from master

1 files changed, 2 insertions, 5 deletions

diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py
index a9bf319a05..3d42a4e407 100644
--- a/tests/gis_tests/geoapp/test_functions.py
+++ b/tests/gis_tests/geoapp/test_functions.py
@@ -223,12 +223,9 @@ class GISFunctionsTests(TestCase):
         geom = Point(5, 23, srid=4326)
         qs = Country.objects.annotate(inter=functions.Intersection('mpoly', geom))
         for c in qs:
-            if spatialite or mysql:
-                # When the intersection is empty, Spatialite and MySQL return None
+            if spatialite or mysql or oracle:
+                # When the intersection is empty, some databases return None.
                 expected = None
-            elif oracle:
-                # When the intersection is empty, Oracle returns an empty string
-                expected = ''
             else:
                 expected = c.mpoly.intersection(geom)
             self.assertEqual(c.inter, expected)