From 84283ab9cdf20178dabc5a0c06f42a6c3b3801c6 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Fri, 29 Jan 2021 07:03:40 +0100
Subject: [PATCH] Fixed #32390 -- Dropped support for Oracle 12.2 and 18c.

---
 django/db/backends/oracle/features.py  | 7 +------
 docs/ref/contrib/gis/install/index.txt | 2 +-
 docs/ref/databases.txt                 | 4 ++--
 docs/releases/4.0.txt                  | 7 +++++++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/django/db/backends/oracle/features.py b/django/db/backends/oracle/features.py
index 2570675809..07f16eee71 100644
--- a/django/db/backends/oracle/features.py
+++ b/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,)
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt
index cc72a8dc2b..56b5799891 100644
--- a/docs/ref/contrib/gis/install/index.txt
+++ b/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+
 ==================  ==============================  ==================  =========================================
 
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index b9a82140a0..04f420984c 100644
--- a/docs/ref/databases.txt
+++ b/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/
diff --git a/docs/releases/4.0.txt b/docs/releases/4.0.txt
index 99ad826865..185159d9ad 100644
--- a/docs/releases/4.0.txt
+++ b/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
 -------------