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

Fixed #29507 -- Added Oracle support for Envelope GIS function.

This commit is contained in:
Sergey Fedoseev 2018-06-20 16:48:57 +05:00
parent d8d21d3891
commit fa453b03a6
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/gis/db/backends/oracle/operations.py
View File

@ -68,6 +68,7 @@ class OracleOperations(BaseSpatialOperations, DatabaseOperations):
'Centroid': 'SDO_GEOM.SDO_CENTROID', 'Centroid': 'SDO_GEOM.SDO_CENTROID',
'Difference': 'SDO_GEOM.SDO_DIFFERENCE', 'Difference': 'SDO_GEOM.SDO_DIFFERENCE',
'Distance': 'SDO_GEOM.SDO_DISTANCE', 'Distance': 'SDO_GEOM.SDO_DISTANCE',
'Envelope': 'SDO_GEOM_MBR',
'Intersection': 'SDO_GEOM.SDO_INTERSECTION', 'Intersection': 'SDO_GEOM.SDO_INTERSECTION',
'IsValid': 'SDO_GEOM.VALIDATE_GEOMETRY_WITH_CONTEXT', 'IsValid': 'SDO_GEOM.VALIDATE_GEOMETRY_WITH_CONTEXT',
'Length': 'SDO_GEOM.SDO_LENGTH', 'Length': 'SDO_GEOM.SDO_LENGTH',
@ -105,7 +106,7 @@ class OracleOperations(BaseSpatialOperations, DatabaseOperations):
} }
unsupported_functions = { unsupported_functions = {
'AsGeoJSON', 'AsKML', 'AsSVG', 'Azimuth', 'Envelope', 'AsGeoJSON', 'AsKML', 'AsSVG', 'Azimuth',
'ForcePolygonCW', 'ForceRHR', 'GeoHash', 'LineLocatePoint', 'ForcePolygonCW', 'ForceRHR', 'GeoHash', 'LineLocatePoint',
'MakeValid', 'MemSize', 'Scale', 'SnapToGrid', 'Translate', 'MakeValid', 'MemSize', 'Scale', 'SnapToGrid', 'Translate',
} }

2
docs/ref/contrib/gis/db-api.txt
View File

@ -381,7 +381,7 @@ Function PostGIS Oracle MySQL Spat
:class:`Centroid` X X X X :class:`Centroid` X X X X
:class:`Difference` X X X X :class:`Difference` X X X X
:class:`Distance` X X X X :class:`Distance` X X X X
:class:`Envelope` X X X :class:`Envelope` X X X X
:class:`ForceRHR` X :class:`ForceRHR` X
:class:`GeoHash` X X (≥ 5.7.5) X (LWGEOM) :class:`GeoHash` X X (≥ 5.7.5) X (LWGEOM)
:class:`Intersection` X X X X :class:`Intersection` X X X X

6
docs/ref/contrib/gis/functions.txt
View File

@ -267,11 +267,17 @@ queryset is calculated::
*Availability*: `MySQL *Availability*: `MySQL
<https://dev.mysql.com/doc/refman/en/gis-general-property-functions.html#function_st-envelope>`__, <https://dev.mysql.com/doc/refman/en/gis-general-property-functions.html#function_st-envelope>`__,
`Oracle
<https://docs.oracle.com/database/121/SPATL/sdo_geom-sdo_mbr.htm#GUID-646638D0-2C5F-490A-AF63-DE9B7A4C97C1__CHDJCEIH>`__,
`PostGIS <https://postgis.net/docs/ST_Envelope.html>`__, SpatiaLite `PostGIS <https://postgis.net/docs/ST_Envelope.html>`__, SpatiaLite
Accepts a single geographic field or expression and returns the geometry Accepts a single geographic field or expression and returns the geometry
representing the bounding box of the geometry. representing the bounding box of the geometry.
.. versionchanged:: 2.2
Oracle support was added.
``ForcePolygonCW`` ``ForcePolygonCW``
================== ==================

3
docs/releases/2.2.txt
View File

@ -56,7 +56,8 @@ Minor features
:mod:`django.contrib.gis` :mod:`django.contrib.gis`
~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~
* ... * Added Oracle support for the
:class:`~django.contrib.gis.db.models.functions.Envelope` function.
:mod:`django.contrib.messages` :mod:`django.contrib.messages`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~