From 52fec5d18f46febedd461c47f3829750a2a7160b Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Thu, 11 Oct 2018 11:43:16 +0200 Subject: [PATCH] Fixed #29836 -- Bumped required cx_Oracle to 6.0. --- django/db/backends/oracle/base.py | 2 -- docs/ref/databases.txt | 2 +- docs/releases/2.2.txt | 2 ++ tests/requirements/oracle.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index 2df77d7630..8ad3f6cf2b 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -390,8 +390,6 @@ class FormatStylePlaceholderCursor: def __init__(self, connection): self.cursor = connection.cursor() self.cursor.outputtypehandler = self._output_type_handler - # The default for cx_Oracle < 5.3 is 50. - self.cursor.arraysize = 100 @staticmethod def _output_number_converter(value): diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 77e6236a72..16dd625267 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -731,7 +731,7 @@ Oracle notes ============ Django supports `Oracle Database Server`_ versions 12.1 and higher. Version -5.2 or higher of the `cx_Oracle`_ Python driver is required. +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/2.2.txt b/docs/releases/2.2.txt index 19c98639d8..8f5409e1d1 100644 --- a/docs/releases/2.2.txt +++ b/docs/releases/2.2.txt @@ -302,6 +302,8 @@ Miscellaneous of a bytestring, and :func:`django.utils.http.urlsafe_base64_decode` may no longer be passed a bytestring. +* Support for ``cx_Oracle`` < 6.0 is removed. + .. _deprecated-features-2.2: Features deprecated in 2.2 diff --git a/tests/requirements/oracle.txt b/tests/requirements/oracle.txt index ae5b7349cd..763baa8579 100644 --- a/tests/requirements/oracle.txt +++ b/tests/requirements/oracle.txt @@ -1 +1 @@ -cx_oracle +cx_oracle >= 6.0