Move schema elements specific for Oracle Database 21 and higher to a

separate script for ease of maintenance.

Author: anthony-tuininga

tests/create_schema.py

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 #
 # This software is dual-licensed to you under the Universal Permissive License
 # (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -47,6 +47,9 @@
                         main_password=test_env.get_main_password(),
                         proxy_user=test_env.get_proxy_user(),
                         proxy_password=test_env.get_proxy_password())
+if test_env.get_server_version() >= (21, 0):
+    test_env.run_sql_script(conn, "create_schema_21",
+                            main_user=test_env.get_main_user())
 if test_env.is_on_oracle_cloud(conn):
     test_env.run_sql_script(conn, "create_schema_cloud",
                             main_user=test_env.get_main_user())

tests/sql/create_schema.sql

@@ -313,35 +313,9 @@ create table &main_user..PlsqlSessionCallbacks (
 )
 /
 
-declare
-    t_Version                           number;
-begin
-
-    select to_number(substr(version, 1, instr(version, '.') - 1))
-    into t_Version
-    from product_component_version
-    where product like 'Oracle Database%';
-
-    if t_Version >= 21 then
-        execute immediate 'create table &main_user..TestJson (' ||
-                          '    IntCol number(9) not null,' ||
-                          '    JsonCol json not null' ||
-                          ')';
-    end if;
-
-end;
-/
-
 -- create queue table and queues for testing advanced queuing
-declare
-    t_Version                           number;
 begin
 
-    select to_number(substr(version, 1, instr(version, '.') - 1))
-    into t_Version
-    from product_component_version
-    where product like 'Oracle Database%';
-
     dbms_aqadm.create_queue_table('&main_user..BOOK_QUEUE_TAB',
             '&main_user..UDT_BOOK');
     dbms_aqadm.create_queue('&main_user..TEST_BOOK_QUEUE',
@@ -361,13 +335,6 @@ begin
     dbms_aqadm.add_subscriber('&main_user..BOOK_QUEUE_MULTI',
             sys.aq$_agent('Sub1', null, null));
 
-    if t_Version >= 21 then
-        dbms_aqadm.create_queue_table('&main_user..JSON_QUEUE_TAB', 'JSON');
-        dbms_aqadm.create_queue('&main_user..TEST_JSON_QUEUE',
-                '&main_user..JSON_QUEUE_TAB');
-        dbms_aqadm.start_queue('&main_user..TEST_JSON_QUEUE');
-    end if;
-
 end;
 /
 

tests/sql/create_schema_21.sql

@@ -0,0 +1,46 @@
+/*-----------------------------------------------------------------------------
+ * Copyright (c) 2023, Oracle and/or its affiliates.
+ *
+ * This software is dual-licensed to you under the Universal Permissive License
+ * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
+ * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
+ * either license.*
+ *
+ * If you elect to accept the software under the Apache License, Version 2.0,
+ * the following applies:
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *---------------------------------------------------------------------------*/
+
+/*-----------------------------------------------------------------------------
+ * create_schema_21.sql
+ *
+ * Performs the actual work of creating and populating the schemas with the
+ * database objects used by the python-oracledb test suite that require Oracle
+ * Database 21c or higher. It is executed by the Python script
+ * create_schema.py.
+ *---------------------------------------------------------------------------*/
+
+create table &main_user..TestJson (
+    IntCol number(9) not null,
+    JsonCol json not null
+)
+/
+
+begin
+    dbms_aqadm.create_queue_table('&main_user..JSON_QUEUE_TAB', 'JSON');
+    dbms_aqadm.create_queue('&main_user..TEST_JSON_QUEUE',
+            '&main_user..JSON_QUEUE_TAB');
+    dbms_aqadm.start_queue('&main_user..TEST_JSON_QUEUE');
+end;
+/