Refs #36112 -- Added proper fallback regression test for Oracle last_…

…executed_query().
django · VIZZARD-X · Nov 22, 2025 · Nov 25, 2025 · Nov 27, 2025 · Nov 27, 2025
commit 691979d86a85648ee2a6099f89076036dd148ee6
diff --git a/django/db/backends/postgresql/operations.py b/django/db/backends/postgresql/operations.py
@@ -302,11 +302,11 @@ def last_executed_query(self, cursor, sql, params):
                 try:
                     return self.compose_sql(sql, params)
                 except errors.DataError:
-                    return None
+                    return super().last_executed_query(cursor, sql, params)
             else:
                 if cursor._query and cursor._query.query is not None:
                     return cursor._query.query.decode()
-                return None
+                return super().last_executed_query(cursor, sql, params)
 
     else:
 
@@ -315,7 +315,7 @@ def last_executed_query(self, cursor, sql, params):
             # The query attribute is a Psycopg extension to the DB API 2.0.
             if cursor.query is not None:
                 return cursor.query.decode()
-            return None
+            return super().last_executed_query(cursor, sql, params)
 
     if is_psycopg3:
 

diff --git a/tests/backends/base/test_base.py b/tests/backends/base/test_base.py
@@ -3,7 +3,6 @@
 
 from django.db import DEFAULT_DB_ALIAS, connection, connections, transaction
 from django.db.backends.base.base import BaseDatabaseWrapper
-from django.db.backends.base.operations import BaseDatabaseOperations
 from django.test import (
     SimpleTestCase,
     TestCase,
@@ -437,34 +436,3 @@ def test_multi_database_init_connection_state_called_once(self):
                             len(mocked_check_database_version_supported.mock_calls),
                             after_first_calls,
                         )
-
-
-class DummyCursor:
-    def __init__(self, statement=None):
-        self.statement = statement
-
-
-class DummyConnection:
-    vendor = "sqlite"
-    alias = "default"
-    features = MagicMock()
-    settings_dict = {}
-
-    def __init__(self):
-        self.ops = DummyBackendOperations(self)
-        self.queries_log = []
-
-
-class DummyBackendOperations(BaseDatabaseOperations):
-    """
-    Simulates a backend with the fallback behavior implemented in the patch:
-    - If cursor.statement is truthy, return it.
-    - If cursor.statement is None, fallback to the base implementation.
-    """
-
-    def __init__(self, connection):
-        super().__init__(connection)
-
-    def last_executed_query(self, cursor, sql, params):
-        statement = getattr(cursor, "statement", None)
-        return statement or super().last_executed_query(cursor, sql, params)
diff --git a/tests/backends/oracle/test_last_executed_query.py b/tests/backends/oracle/test_last_executed_query.py
@@ -0,0 +1,21 @@
+from django.db import connection
+from django.test import TestCase
+from django.test.utils import skipUnless
+
+
+@skipUnless(connection.vendor == "oracle", "Oracle-specific tests")
+class TestLastExecutedQueryFallback(TestCase):
+    def test_last_executed_query_fallback(self):
+        # Use a real Oracle cursor and force an error
+        with connection.cursor() as cursor:
+            sql = "INVALID SQL"
+            params = []
+            try:
+                cursor.execute(sql, params)
+            except Exception:
+                pass
+
+            # The result MUST NOT be None and MUST fall back to the SQL string
+            result = connection.ops.last_executed_query(cursor, sql, params)
+            self.assertIsNotNone(result)
+            self.assertEqual(result, sql)
-            self.assertIsNotNone(result)
-            self.assertEqual(result, sql)
+            self.assertEqual(result, sql)
-            self.assertIsNotNone(result)
-            self.assertEqual(result, sql)
+            self.assertEqual(result, sql)
diff --git a/tests/backends/postgresql/test_last_executed_query.py b/tests/backends/postgresql/test_last_executed_query.py
@@ -0,0 +1,21 @@
+from django.db import connection
+from django.test import TestCase
+from django.test.utils import skipUnless
+
+
+@skipUnless(connection.vendor == "postgresql", "PostgreSQL-specific tests")
+class TestLastExecutedQueryFallback(TestCase):
+    def test_last_executed_query_fallback(self):
+        # Use a real PostgreSQL cursor and force an error
+        with connection.cursor() as cursor:
+            sql = "INVALID SQL"
+            params = []
+            try:
+                cursor.execute(sql, params)
+            except Exception:
+                pass
+
+            # The result MUST NOT be None and MUST fall back to the SQL string
+            result = connection.ops.last_executed_query(cursor, sql, params)
+            self.assertIsNotNone(result)
+            self.assertEqual(result, sql)