From 315dbe675df338ae66c8fa43274a76ecbed7ef67 Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Wed, 8 Oct 2025 18:20:57 +0200 Subject: Fixed #36646 -- Added compatibility for oracledb 3.4.0. The Database.Binary, Date, and Timestamp attributes were changed from aliases to bytes, datetime.date, and datetime.datetime to factory functions in oracle/python-oracledb@869a887819cdac7fcd610f9d9d463ade49ea7 which made their usage inadequate for isinstance checks. Thanks John Wagenleitner for the report and Natalia for the triage. Co-authored-by: Mariusz Felisiak --- django/db/backends/oracle/base.py | 2 +- django/db/backends/oracle/operations.py | 4 ++-- django/db/backends/oracle/utils.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'django') diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index bf79f7a6e3..48fa01ebee 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -433,7 +433,7 @@ class OracleParam: param = 0 if hasattr(param, "bind_parameter"): self.force_bytes = param.bind_parameter(cursor) - elif isinstance(param, (Database.Binary, datetime.timedelta)): + elif isinstance(param, (bytes, datetime.timedelta)): self.force_bytes = param else: # To transmit to the database, we need Unicode if supported diff --git a/django/db/backends/oracle/operations.py b/django/db/backends/oracle/operations.py index e5da5928f9..1da4fe6127 100644 --- a/django/db/backends/oracle/operations.py +++ b/django/db/backends/oracle/operations.py @@ -273,12 +273,12 @@ END; return value def convert_datefield_value(self, value, expression, connection): - if isinstance(value, Database.Timestamp): + if isinstance(value, datetime.datetime): value = value.date() return value def convert_timefield_value(self, value, expression, connection): - if isinstance(value, Database.Timestamp): + if isinstance(value, datetime.datetime): value = value.time() return value diff --git a/django/db/backends/oracle/utils.py b/django/db/backends/oracle/utils.py index fd7deab9a2..bd167528da 100644 --- a/django/db/backends/oracle/utils.py +++ b/django/db/backends/oracle/utils.py @@ -24,7 +24,7 @@ class BoundVar: "BooleanField": int, "FloatField": Database.DB_TYPE_BINARY_DOUBLE, "DateTimeField": Database.DB_TYPE_TIMESTAMP, - "DateField": Database.Date, + "DateField": datetime.date, "DecimalField": decimal.Decimal, } -- cgit v1.3