From b07e2d57a000d98c73492e5242fed91d502a780a Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Sat, 16 Mar 2024 11:50:59 +0100
Subject: [PATCH] Stopped skipping
 model_fields.test_jsonfield.TestQuerying.test_usage_in_subquery on Oracle
 23c.

---
 django/db/backends/oracle/features.py | 84 +++++++++++++++------------
 1 file changed, 48 insertions(+), 36 deletions(-)

diff --git a/django/db/backends/oracle/features.py b/django/db/backends/oracle/features.py
index a48bc627f70..d698baa9932 100644
--- a/django/db/backends/oracle/features.py
+++ b/django/db/backends/oracle/features.py
@@ -81,42 +81,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     supports_json_field_contains = False
     supports_collation_on_textfield = False
     test_now_utc_template = "CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"
-
-    django_test_skips = {
-        "Oracle doesn't support SHA224.": {
-            "db_functions.text.test_sha224.SHA224Tests.test_basic",
-            "db_functions.text.test_sha224.SHA224Tests.test_transform",
-        },
-        "Oracle doesn't correctly calculate ISO 8601 week numbering before "
-        "1583 (the Gregorian calendar was introduced in 1582).": {
-            "db_functions.datetime.test_extract_trunc.DateFunctionTests."
-            "test_trunc_week_before_1000",
-            "db_functions.datetime.test_extract_trunc.DateFunctionWithTimeZoneTests."
-            "test_trunc_week_before_1000",
-        },
-        "Oracle doesn't support bitwise XOR.": {
-            "expressions.tests.ExpressionOperatorTests.test_lefthand_bitwise_xor",
-            "expressions.tests.ExpressionOperatorTests.test_lefthand_bitwise_xor_null",
-            "expressions.tests.ExpressionOperatorTests."
-            "test_lefthand_bitwise_xor_right_null",
-        },
-        "Oracle requires ORDER BY in row_number, ANSI:SQL doesn't.": {
-            "expressions_window.tests.WindowFunctionTests.test_row_number_no_ordering",
-        },
-        "Raises ORA-00600: internal error code.": {
-            "model_fields.test_jsonfield.TestQuerying.test_usage_in_subquery",
-        },
-        "Oracle doesn't support changing collations on indexed columns (#33671).": {
-            "migrations.test_operations.OperationTests."
-            "test_alter_field_pk_fk_db_collation",
-        },
-        "Oracle doesn't support comparing NCLOB to NUMBER.": {
-            "generic_relations_regress.tests.GenericRelationTests.test_textlink_filter",
-        },
-        "Oracle doesn't support casting filters to NUMBER.": {
-            "lookup.tests.LookupQueryingTests.test_aggregate_combined_lookup",
-        },
-    }
     django_test_expected_failures = {
         # A bug in Django/oracledb with respect to string handling (#23843).
         "annotations.tests.NonAggregateAnnotationTestCase.test_custom_functions",
@@ -127,6 +91,54 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "INSERT INTO {} VALUES (DEFAULT, DEFAULT, DEFAULT)"
     )
 
+    @cached_property
+    def django_test_skips(self):
+        skips = {
+            "Oracle doesn't support SHA224.": {
+                "db_functions.text.test_sha224.SHA224Tests.test_basic",
+                "db_functions.text.test_sha224.SHA224Tests.test_transform",
+            },
+            "Oracle doesn't correctly calculate ISO 8601 week numbering before "
+            "1583 (the Gregorian calendar was introduced in 1582).": {
+                "db_functions.datetime.test_extract_trunc.DateFunctionTests."
+                "test_trunc_week_before_1000",
+                "db_functions.datetime.test_extract_trunc."
+                "DateFunctionWithTimeZoneTests.test_trunc_week_before_1000",
+            },
+            "Oracle doesn't support bitwise XOR.": {
+                "expressions.tests.ExpressionOperatorTests.test_lefthand_bitwise_xor",
+                "expressions.tests.ExpressionOperatorTests."
+                "test_lefthand_bitwise_xor_null",
+                "expressions.tests.ExpressionOperatorTests."
+                "test_lefthand_bitwise_xor_right_null",
+            },
+            "Oracle requires ORDER BY in row_number, ANSI:SQL doesn't.": {
+                "expressions_window.tests.WindowFunctionTests."
+                "test_row_number_no_ordering",
+            },
+            "Oracle doesn't support changing collations on indexed columns (#33671).": {
+                "migrations.test_operations.OperationTests."
+                "test_alter_field_pk_fk_db_collation",
+            },
+            "Oracle doesn't support comparing NCLOB to NUMBER.": {
+                "generic_relations_regress.tests.GenericRelationTests."
+                "test_textlink_filter",
+            },
+            "Oracle doesn't support casting filters to NUMBER.": {
+                "lookup.tests.LookupQueryingTests.test_aggregate_combined_lookup",
+            },
+        }
+        if self.connection.oracle_version < (23,):
+            skips.update(
+                {
+                    "Raises ORA-00600 on Oracle < 23c: internal error code.": {
+                        "model_fields.test_jsonfield.TestQuerying."
+                        "test_usage_in_subquery",
+                    },
+                }
+            )
+        return skips
+
     @cached_property
     def introspected_field_types(self):
         return {