浏览代码

Updated Oracle docs links to Oracle 18c.

Mariusz Felisiak 6 年之前
父节点
当前提交
759a9b710c

+ 3 - 3
django/db/backends/oracle/operations.py

@@ -74,11 +74,11 @@ END;
         elif lookup_type == 'iso_year':
         elif lookup_type == 'iso_year':
             return "TO_CHAR(%s, 'IYYY')" % field_name
             return "TO_CHAR(%s, 'IYYY')" % field_name
         else:
         else:
-            # https://docs.oracle.com/database/121/SQLRF/functions067.htm#SQLRF00639
+            # https://docs.oracle.com/en/database/oracle/oracle-database/18/sqlrf/EXTRACT-datetime.html
             return "EXTRACT(%s FROM %s)" % (lookup_type.upper(), field_name)
             return "EXTRACT(%s FROM %s)" % (lookup_type.upper(), field_name)
 
 
     def date_trunc_sql(self, lookup_type, field_name):
     def date_trunc_sql(self, lookup_type, field_name):
-        # https://docs.oracle.com/database/121/SQLRF/functions271.htm#SQLRF52058
+        # https://docs.oracle.com/en/database/oracle/oracle-database/18/sqlrf/ROUND-and-TRUNC-Date-Functions.html
         if lookup_type in ('year', 'month'):
         if lookup_type in ('year', 'month'):
             return "TRUNC(%s, '%s')" % (field_name, lookup_type.upper())
             return "TRUNC(%s, '%s')" % (field_name, lookup_type.upper())
         elif lookup_type == 'quarter':
         elif lookup_type == 'quarter':
@@ -118,7 +118,7 @@ END;
 
 
     def datetime_trunc_sql(self, lookup_type, field_name, tzname):
     def datetime_trunc_sql(self, lookup_type, field_name, tzname):
         field_name = self._convert_field_to_tz(field_name, tzname)
         field_name = self._convert_field_to_tz(field_name, tzname)
-        # https://docs.oracle.com/database/121/SQLRF/functions271.htm#SQLRF52058
+        # https://docs.oracle.com/en/database/oracle/oracle-database/18/sqlrf/ROUND-and-TRUNC-Date-Functions.html
         if lookup_type in ('year', 'month'):
         if lookup_type in ('year', 'month'):
             sql = "TRUNC(%s, '%s')" % (field_name, lookup_type.upper())
             sql = "TRUNC(%s, '%s')" % (field_name, lookup_type.upper())
         elif lookup_type == 'quarter':
         elif lookup_type == 'quarter':

+ 2 - 1
django/db/backends/oracle/schema.py

@@ -95,7 +95,8 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
         # Add it
         # Add it
         self.add_field(model, new_temp_field)
         self.add_field(model, new_temp_field)
         # Explicit data type conversion
         # Explicit data type conversion
-        # https://docs.oracle.com/database/121/SQLRF/sql_elements002.htm#SQLRF51054
+        # https://docs.oracle.com/en/database/oracle/oracle-database/18/sqlrf
+        # /Data-Type-Comparison-Rules.html#GUID-D0C5A47E-6F93-4C2D-9E49-4F2B86B359DD
         new_value = self.quote_name(old_field.column)
         new_value = self.quote_name(old_field.column)
         old_type = old_field.db_type(self.connection)
         old_type = old_field.db_type(self.connection)
         if re.match('^N?CLOB', old_type):
         if re.match('^N?CLOB', old_type):

+ 4 - 3
docs/ref/contrib/gis/functions.txt

@@ -181,7 +181,8 @@ south = ``π``; west = ``3π/2``.
 .. class:: BoundingCircle(expression, num_seg=48, **extra)
 .. class:: BoundingCircle(expression, num_seg=48, **extra)
 
 
 *Availability*: `PostGIS <https://postgis.net/docs/ST_MinimumBoundingCircle.html>`__,
 *Availability*: `PostGIS <https://postgis.net/docs/ST_MinimumBoundingCircle.html>`__,
-`Oracle <https://docs.oracle.com/database/121/SPATL/sdo_geom-sdo_mbc.htm#SPATL1554>`_
+`Oracle <https://docs.oracle.com/en/database/oracle/oracle-database/18/spatl/
+SDO_GEOM-reference.html#GUID-82A61626-BB64-4793-B53D-A0DBEC91831A>`_
 
 
 Accepts a single geographic field or expression and returns the smallest circle
 Accepts a single geographic field or expression and returns the smallest circle
 polygon that can fully contain the geometry.
 polygon that can fully contain the geometry.
@@ -266,8 +267,8 @@ 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>`__,
+`Oracle <https://docs.oracle.com/en/database/oracle/oracle-database/18/spatl/
+SDO_GEOM-reference.html#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

+ 6 - 2
docs/ref/contrib/gis/geoquerysets.txt

@@ -788,7 +788,8 @@ Keyword Argument       Description
                        details.
                        details.
 =====================  =====================================================
 =====================  =====================================================
 
 
-__ https://docs.oracle.com/database/121/SPATL/GUID-3BD00273-E74F-4830-9444-A3BB15AA0AC4.htm#SPATL466
+__ https://docs.oracle.com/en/database/oracle/oracle-database/18/spatl/
+   spatial-concepts.html#GUID-CE10AB14-D5EA-43BA-A647-DAC9EEF41EE6
 
 
 Example::
 Example::
 
 
@@ -885,5 +886,8 @@ Example::
 
 
 .. rubric:: Footnotes
 .. rubric:: Footnotes
 .. [#fnde9im] *See* `OpenGIS Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, at Ch. 2.1.13.2, p. 2-13 (The Dimensionally Extended Nine-Intersection Model).
 .. [#fnde9im] *See* `OpenGIS Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, at Ch. 2.1.13.2, p. 2-13 (The Dimensionally Extended Nine-Intersection Model).
-.. [#fnsdorelate] *See* `SDO_RELATE documentation <https://docs.oracle.com/database/121/SPATL/sdo_relate.htm#SPATL1039>`_, from the Oracle Spatial and Graph Developer's Guide.
+.. [#fnsdorelate] *See* `SDO_RELATE documentation <https://docs.oracle.com/en/
+   database/oracle/oracle-database/18/spatl/spatial-operators-reference.html#
+   GUID-97C17C18-F05E-49B4-BE11-E89B972E2A02>`_, from the Oracle Spatial and
+   Graph Developer's Guide.
 .. [#fncovers] For an explanation of this routine, read `Quirks of the "Contains" Spatial Predicate <https://lin-ear-th-inking.blogspot.com/2007/06/subtleties-of-ogc-covers-spatial.html>`_ by Martin Davis (a PostGIS developer).
 .. [#fncovers] For an explanation of this routine, read `Quirks of the "Contains" Spatial Predicate <https://lin-ear-th-inking.blogspot.com/2007/06/subtleties-of-ogc-covers-spatial.html>`_ by Martin Davis (a PostGIS developer).

+ 3 - 1
docs/ref/models/querysets.txt

@@ -789,7 +789,9 @@ object. If it's ``None``, Django uses the :ref:`current time zone
 
 
     .. _pytz: http://pytz.sourceforge.net/
     .. _pytz: http://pytz.sourceforge.net/
     .. _Time Zones: https://www.postgresql.org/docs/current/static/datatype-datetime.html#DATATYPE-TIMEZONES
     .. _Time Zones: https://www.postgresql.org/docs/current/static/datatype-datetime.html#DATATYPE-TIMEZONES
-    .. _Choosing a Time Zone File: https://docs.oracle.com/database/121/NLSPG/ch4datetime.htm#NLSPG258
+    .. _Choosing a Time Zone File: https://docs.oracle.com/en/database/oracle/
+       oracle-database/18/nlspg/datetime-data-types-and-time-zone-support.html
+       #GUID-805AB986-DE12-4FEA-AF56-5AABCD2132DF
     .. _mysql_tzinfo_to_sql: https://dev.mysql.com/doc/refman/en/mysql-tzinfo-to-sql.html
     .. _mysql_tzinfo_to_sql: https://dev.mysql.com/doc/refman/en/mysql-tzinfo-to-sql.html
 
 
 ``none()``
 ``none()``

+ 3 - 3
docs/ref/unicode.txt

@@ -29,9 +29,9 @@ able to store certain characters in the database, and information will be lost.
 
 
 .. _MySQL manual: https://dev.mysql.com/doc/refman/en/charset-database.html
 .. _MySQL manual: https://dev.mysql.com/doc/refman/en/charset-database.html
 .. _PostgreSQL manual: https://www.postgresql.org/docs/current/static/multibyte.html
 .. _PostgreSQL manual: https://www.postgresql.org/docs/current/static/multibyte.html
-.. _Oracle manual: https://docs.oracle.com/database/121/NLSPG/toc.htm
-.. _section 2: https://docs.oracle.com/database/121/NLSPG/ch2charset.htm#NLSPG002
-.. _section 11: https://docs.oracle.com/database/121/NLSPG/ch11charsetmig.htm#NLSPG011
+.. _Oracle manual: https://docs.oracle.com/en/database/oracle/oracle-database/18/nlspg/index.html
+.. _section 2: https://docs.oracle.com/en/database/oracle/oracle-database/18/nlspg/choosing-character-set.html
+.. _section 11: https://docs.oracle.com/en/database/oracle/oracle-database/18/nlspg/character-set-migration.html
 
 
 All of Django's database backends automatically convert strings into
 All of Django's database backends automatically convert strings into
 the appropriate encoding for talking to the database. They also automatically
 the appropriate encoding for talking to the database. They also automatically

+ 3 - 3
docs/releases/2.0.txt

@@ -237,9 +237,9 @@ Models
   finds the starting index of a string inside another string.
   finds the starting index of a string inside another string.
 
 
 * On Oracle, ``AutoField`` and ``BigAutoField`` are now created as `identity
 * On Oracle, ``AutoField`` and ``BigAutoField`` are now created as `identity
-  columns`_.
-
-  .. _`identity columns`: https://docs.oracle.com/database/121/DRDAA/migr_tools_feat.htm#DRDAA109
+  columns <https://docs.oracle.com/en/database/oracle/oracle-database/18/drdaa/
+  intro-to-tools-and-products-supporting-migraiton.html#GUID-14E4817B-F3BC-4D99
+  -B471-A0ACDC303CC9>`__.
 
 
 * The new ``chunk_size`` parameter of :meth:`.QuerySet.iterator` controls the
 * The new ``chunk_size`` parameter of :meth:`.QuerySet.iterator` controls the
   number of rows fetched by the Python database client when streaming results
   number of rows fetched by the Python database client when streaming results