mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Refs #17448 -- Fixed GeoModelTest.test_raw_sql_query. 

The test was a false positive.
This commit is contained in:
Sergey Fedoseev 2017-10-29 23:25:57 +05:00 committed by Tim Graham
parent e9a370bb6a
commit 69922d303d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/gis_tests/geoapp/tests.py
View File

@ -171,13 +171,12 @@ class GeoModelTest(TestCase):
def test_raw_sql_query(self): def test_raw_sql_query(self):
"Testing raw SQL query." "Testing raw SQL query."
cities1 = City.objects.all() cities1 = City.objects.all()
# Only PostGIS would support a 'select *' query because of its recognized point_select = connection.ops.select % 'point'
# HEXEWKB format for geometry fields cities2 = list(City.objects.raw(
as_text = 'ST_AsText(%s)' if postgis else connection.ops.select 'select id, name, %s as point from geoapp_city' % point_select
cities2 = City.objects.raw( ))
'select id, name, %s from geoapp_city' % as_text % 'point' self.assertEqual(len(cities1), len(cities2))
) with self.assertNumQueries(0): # Ensure point isn't deferred.
self.assertEqual(len(cities1), len(list(cities2)))
self.assertIsInstance(cities2[0].point, Point) self.assertIsInstance(cities2[0].point, Point)
def test_dumpdata_loaddata_cycle(self): def test_dumpdata_loaddata_cycle(self):