Commit dd7346ed authored by Tim Graham's avatar Tim Graham
Browse files

[1.6.x] Made a GIS test work on Oracle. 

Thanks Josh Smeaton and Claude Paroz for advice.

Backport of 7add30df from master
parent 2376319c

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

+4 −2
Original line number Diff line number Diff line
@@ -196,8 +196,10 @@ class GeoModelTest(TestCase): 
        cities1 = City.objects.all()

        # Only PostGIS would support a 'select *' query because of its recognized

        # HEXEWKB format for geometry fields

        as_text = 'ST_AsText' if postgis else 'asText'

        cities2 = City.objects.raw('select id, name, %s(point) from geoapp_city' % as_text)

        as_text = 'ST_AsText(%s)' if postgis else connection.ops.select

        cities2 = City.objects.raw(

            'select id, name, %s from geoapp_city' % as_text % 'point'

        )

        self.assertEqual(len(cities1), len(list(cities2)))

        self.assertTrue(isinstance(cities2[0].point, Point))