mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #25629 -- Added checks of the number of arguments for GeoDjango DB functions.

Browse Source
This commit is contained in:
Sergey Fedoseev
2015-10-30 19:47:35 +05:00
committed by Claude Paroz
parent 1b598b4b42
commit a449b7ef99
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,6 +125,8 @@ class OracleToleranceMixin(object):
class Area(OracleToleranceMixin, GeoFunc):
arity = 1
def as_sql(self, compiler, connection):
if connection.ops.geography:
# Geography fields support area calculation, returns square meters.
@@ -204,11 +206,11 @@ class BoundingCircle(GeoFunc):
class Centroid(OracleToleranceMixin, GeoFunc):
pass
arity = 1
class Difference(OracleToleranceMixin, GeoFuncWithGeoParam):
pass
arity = 2
class DistanceResultMixin(object):
@@ -267,11 +269,11 @@ class Distance(DistanceResultMixin, OracleToleranceMixin, GeoFuncWithGeoParam):
class Envelope(GeoFunc):
pass
arity = 1
class ForceRHR(GeoFunc):
pass
arity = 1
class GeoHash(GeoFunc):
@@ -285,7 +287,7 @@ class GeoHash(GeoFunc):
class Intersection(OracleToleranceMixin, GeoFuncWithGeoParam):
pass
arity = 2
class Length(DistanceResultMixin, OracleToleranceMixin, GeoFunc):
@@ -329,14 +331,17 @@ class Length(DistanceResultMixin, OracleToleranceMixin, GeoFunc):
class MemSize(GeoFunc):
output_field_class = IntegerField
arity = 1
class NumGeometries(GeoFunc):
output_field_class = IntegerField
arity = 1
class NumPoints(GeoFunc):
output_field_class = IntegerField
arity = 1
def as_sqlite(self, compiler, connection):
if self.source_expressions[self.geom_param_pos].output_field.geom_type != 'LINESTRING':
@@ -346,6 +351,7 @@ class NumPoints(GeoFunc):
class Perimeter(DistanceResultMixin, OracleToleranceMixin, GeoFunc):
output_field_class = FloatField
arity = 1
def as_postgresql(self, compiler, connection):
dim = min(f.dim for f in self.get_source_fields())
@@ -355,11 +361,11 @@ class Perimeter(DistanceResultMixin, OracleToleranceMixin, GeoFunc):
class PointOnSurface(OracleToleranceMixin, GeoFunc):
pass
arity = 1
class Reverse(GeoFunc):
pass
arity = 1
class Scale(SQLiteDecimalToFloatMixin, GeoFunc):
@@ -396,7 +402,7 @@ class SnapToGrid(SQLiteDecimalToFloatMixin, GeoFunc):
class SymDifference(OracleToleranceMixin, GeoFuncWithGeoParam):
pass
arity = 2
class Transform(GeoFunc):
@@ -432,4 +438,4 @@ class Translate(Scale):
class Union(OracleToleranceMixin, GeoFuncWithGeoParam):
pass
arity = 2