Browse Source

Fixed #32390 -- Dropped support for Oracle 12.2 and 18c.

Mariusz Felisiak 4 years ago
parent
commit
84283ab9cd

+ 1 - 6
django/db/backends/oracle/features.py

@@ -84,7 +84,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "Oracle requires ORDER BY in row_number, ANSI:SQL doesn't.": {
             'expressions_window.tests.WindowFunctionTests.test_row_number_no_ordering',
         },
-        'Raises ORA-00600: internal error code on Oracle 18.': {
+        'Raises ORA-00600: internal error code.': {
             'model_fields.test_jsonfield.TestQuerying.test_usage_in_subquery',
         },
     }
@@ -116,8 +116,3 @@ class DatabaseFeatures(BaseDatabaseFeatures):
                     return False
                 raise
             return True
-
-    @cached_property
-    def has_json_object_function(self):
-        # Oracle < 18 supports JSON_OBJECT() but it's not fully functional.
-        return self.connection.oracle_version >= (18,)

+ 1 - 1
docs/ref/contrib/gis/install/index.txt

@@ -60,7 +60,7 @@ Database            Library Requirements            Supported Versions  Notes
 ==================  ==============================  ==================  =========================================
 PostgreSQL          GEOS, GDAL, PROJ, PostGIS       10+                 Requires PostGIS.
 MySQL               GEOS, GDAL                      5.7+                :ref:`Limited functionality <mysql-spatial-limitations>`.
-Oracle              GEOS, GDAL                      12.2+               XE not supported.
+Oracle              GEOS, GDAL                      19+                 XE not supported.
 SQLite              GEOS, GDAL, PROJ, SpatiaLite    3.9.0+              Requires SpatiaLite 4.3+
 ==================  ==============================  ==================  =========================================
 

+ 2 - 2
docs/ref/databases.txt

@@ -842,8 +842,8 @@ To enable the JSON1 extension you can follow the instruction on
 Oracle notes
 ============
 
-Django supports `Oracle Database Server`_ versions 12.2 and higher. Version
-6.0 or higher of the `cx_Oracle`_ Python driver is required.
+Django supports `Oracle Database Server`_ versions 19c and higher. Version 6.0
+or higher of the `cx_Oracle`_ Python driver is required.
 
 .. _`Oracle Database Server`: https://www.oracle.com/
 .. _`cx_Oracle`: https://oracle.github.io/python-cx_Oracle/

+ 7 - 0
docs/releases/4.0.txt

@@ -241,6 +241,13 @@ Dropped support for PostgreSQL 9.6
 Upstream support for PostgreSQL 9.6 ends in November 2021. Django 4.0 supports
 PostgreSQL 10 and higher.
 
+Dropped support for Oracle 12.2 and 18c
+---------------------------------------
+
+Upstream support for Oracle 12.2 ends in March 2022 and for Oracle 18c it ends
+in June 2021. Django 3.2 will be supported until April 2024. Django 4.0
+officially supports Oracle 19c.
+
 Miscellaneous
 -------------