From e5025e6de94d8ff71de25ebe6f3e4df4d0d199a9 Mon Sep 17 00:00:00 2001 From: Sylvie Paindeville Date: Fri, 17 Oct 2025 08:58:01 +0200 Subject: [PATCH 1/3] allow json data type for new oracle dbversion 26ai (if not duality view) - as for 23ai --- types/json.json | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/types/json.json b/types/json.json index a898d23a..13a7f7e5 100644 --- a/types/json.json +++ b/types/json.json @@ -21,9 +21,19 @@ "type": "and", "values": [ { - "level": "model", - "key": "dbVersion", - "value": "23ai" + "type": "or", + "values": [ + { + "level": "model", + "key": "dbVersion", + "value": "23ai" + }, + { + "level": "model", + "key": "dbVersion", + "value": "26ai" + } + ] }, { "type": "or", From e8df9639d9dbe884dcbc815106ed9dc244a670e0 Mon Sep 17 00:00:00 2001 From: Sylvie Paindeville Date: Fri, 17 Oct 2025 10:02:59 +0200 Subject: [PATCH 2/3] changing approach to rather invalidate older versions for json so every new version will have json enabled by default --- types/json.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/types/json.json b/types/json.json index 13a7f7e5..6144a670 100644 --- a/types/json.json +++ b/types/json.json @@ -12,26 +12,26 @@ "dependency": { "type": "or", "values": [ - { - "level": "model", - "key": "dbVersion", - "value": "21c" - }, { "type": "and", "values": [ { - "type": "or", + "type": "not", "values": [ { "level": "model", "key": "dbVersion", - "value": "23ai" + "value": "12c" + }, + { + "level": "model", + "key": "dbVersion", + "value": "18c" }, { "level": "model", "key": "dbVersion", - "value": "26ai" + "value": "19c" } ] }, From 3ac0c73e9a152231d9a2583f57b5bc91dac6d4fd Mon Sep 17 00:00:00 2001 From: Sylvie Paindeville Date: Fri, 17 Oct 2025 10:06:45 +0200 Subject: [PATCH 3/3] remove unnecessary level --- types/json.json | 61 +++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/types/json.json b/types/json.json index 6144a670..d437e890 100644 --- a/types/json.json +++ b/types/json.json @@ -10,45 +10,40 @@ "source": true }, "dependency": { - "type": "or", + "type": "and", "values": [ { - "type": "and", + "type": "not", "values": [ { - "type": "not", - "values": [ - { - "level": "model", - "key": "dbVersion", - "value": "12c" - }, - { - "level": "model", - "key": "dbVersion", - "value": "18c" - }, - { - "level": "model", - "key": "dbVersion", - "value": "19c" - } - ] + "level": "model", + "key": "dbVersion", + "value": "12c" }, { - "type": "or", - "values": [ - { - "level": "root", - "key": "duality", - "value": false - }, - { - "level": "root", - "key": "duality", - "exist": false - } - ] + "level": "model", + "key": "dbVersion", + "value": "18c" + }, + { + "level": "model", + "key": "dbVersion", + "value": "19c" + } + ] + }, + { + "type": "or", + "values": [ + { + "level": "root", + "key": "duality", + "value": false + }, + { + "level": "root", + "key": "duality", + "exist": false } ] }