From da92ec79621fc0bba671d8afa52b7f6884962fe5 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Sun, 16 Sep 2018 12:45:34 +0200 Subject: [PATCH] Fixed #29759 -- Fixed crash on Oracle when fetching a returned insert id with cx_Oracle 7. --- django/db/backends/oracle/operations.py | 4 +++- docs/releases/2.1.2.txt | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/django/db/backends/oracle/operations.py b/django/db/backends/oracle/operations.py index 02c7cdcc63..9cfee5897d 100644 --- a/django/db/backends/oracle/operations.py +++ b/django/db/backends/oracle/operations.py @@ -226,7 +226,9 @@ END; def fetch_returned_insert_id(self, cursor): try: - return int(cursor._insert_id_var.getvalue()) + value = cursor._insert_id_var.getvalue() + # cx_Oracle < 7 returns value, >= 7 returns list with single value. + return int(value[0] if isinstance(value, list) else value) except (IndexError, TypeError): # cx_Oracle < 6.3 returns None, >= 6.3 raises IndexError. raise DatabaseError( diff --git a/docs/releases/2.1.2.txt b/docs/releases/2.1.2.txt index bcaa47555e..3118df77ae 100644 --- a/docs/releases/2.1.2.txt +++ b/docs/releases/2.1.2.txt @@ -17,3 +17,5 @@ Bugfixes * Made migrations detect changes to ``Meta.default_related_name`` (:ticket:`29755`). + +* Added compatibility for ``cx_Oracle`` 7 (:ticket:`29759`).