p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #28383 -- Made NumPoints GIS function return None for non-LINESTRING geometries on MySQL.

This commit is contained in:
Sergey Fedoseev 2017-07-11 18:21:11 +06:00 committed by Tim Graham
parent 719b370b34
commit 306b961a4d
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/gis/db/models/functions.py
View File

@ -419,12 +419,6 @@ class NumPoints(GeoFunc):
output_field_class = IntegerField output_field_class = IntegerField
arity = 1 arity = 1
def as_sql(self, compiler, connection):
if self.source_expressions[self.geom_param_pos[0]].output_field.geom_type != 'LINESTRING':
if not connection.features.supports_num_points_poly:
raise TypeError('NumPoints can only operate on LineString content on this database.')
return super().as_sql(compiler, connection)
class Perimeter(DistanceResultMixin, OracleToleranceMixin, GeoFunc): class Perimeter(DistanceResultMixin, OracleToleranceMixin, GeoFunc):
arity = 1 arity = 1

5
tests/gis_tests/geoapp/test_functions.py
View File

@ -336,9 +336,8 @@ class GISFunctionsTests(TestCase):
self.assertEqual(qs.first().num_points, 2) self.assertEqual(qs.first().num_points, 2)
mpoly_qs = Country.objects.annotate(num_points=functions.NumPoints('mpoly')) mpoly_qs = Country.objects.annotate(num_points=functions.NumPoints('mpoly'))
if not connection.features.supports_num_points_poly: if not connection.features.supports_num_points_poly:
msg = 'NumPoints can only operate on LineString content on this database.' for c in mpoly_qs:
with self.assertRaisesMessage(TypeError, msg): self.assertIsNone(c.num_points)
list(mpoly_qs)
return return
for c in mpoly_qs: for c in mpoly_qs: