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

Refs #32390 -- Bumped required cx_Oracle to 7.0.

This commit is contained in:
Mariusz Felisiak 2021-01-29 13:07:05 +01:00
parent 84283ab9cd
commit f39634ff22
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/backends/oracle/operations.py
View File

@ -258,16 +258,14 @@ END;
columns = [] columns = []
for param in returning_params: for param in returning_params:
value = param.get_value() value = param.get_value()
if value is None or value == []: if value == []:
# cx_Oracle < 6.3 returns None, >= 6.3 returns empty list.
raise DatabaseError( raise DatabaseError(
'The database did not return a new row id. Probably ' 'The database did not return a new row id. Probably '
'"ORA-1403: no data found" was raised internally but was ' '"ORA-1403: no data found" was raised internally but was '
'hidden by the Oracle OCI library (see ' 'hidden by the Oracle OCI library (see '
'https://code.djangoproject.com/ticket/28859).' 'https://code.djangoproject.com/ticket/28859).'
) )
# cx_Oracle < 7 returns value, >= 7 returns list with single value. columns.append(value[0])
columns.append(value[0] if isinstance(value, list) else value)
return tuple(columns) return tuple(columns)
def field_cast_sql(self, db_type, internal_type): def field_cast_sql(self, db_type, internal_type):

2
docs/ref/databases.txt
View File

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

2
docs/releases/4.0.txt
View File

@ -251,7 +251,7 @@ officially supports Oracle 19c.
Miscellaneous Miscellaneous
------------- -------------
* ... * Support for ``cx_Oracle`` < 7.0 is removed.
.. _deprecated-features-4.0: .. _deprecated-features-4.0:

2
tests/requirements/oracle.txt
View File

@ -1 +1 @@
cx_oracle >= 6.0 cx_oracle >= 7.0