From 71029acd7fb590661ae334c75889c0f48d540d9f Mon Sep 17 00:00:00 2001
From: javiertuya <10879637+javiertuya@users.noreply.github.com>
Date: Sun, 3 Dec 2023 09:58:54 +0100
Subject: [PATCH] Migrate oracle to 21.3.0

---
 .github/workflows/test.yml   | 2 +-
 setup/container-setup.sh     | 2 +-
 setup/oracle/oracle-setup.sh | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7be3d97..e6561aa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -68,7 +68,7 @@ jobs:
             -e ORACLE_PASSWORD=$TEST_ORACLE_PWD \
             -e TEST_ORACLE_PWD="$TEST_ORACLE_PWD" \
             -v ${GITHUB_WORKSPACE}/setup/oracle:/container-entrypoint-initdb.d \
-            gvenzl/oracle-xe:11.2.0.2-slim-faststart
+            gvenzl/oracle-xe:21.3.0-slim
           chmod u+x setup/wait-container-ready.sh && ./setup/wait-container-ready.sh test-oracle "DATABASE IS READY TO USE!"
 
       # Run the tests, a step for those that use a DBMS, other for core
diff --git a/setup/container-setup.sh b/setup/container-setup.sh
index 8b9c0fb..67626b7 100644
--- a/setup/container-setup.sh
+++ b/setup/container-setup.sh
@@ -47,7 +47,7 @@ docker run -d -p 1521:1521 --name test-oracle  --restart unless-stopped \
   -e ORACLE_PASSWORD=$TEST_ORACLE_PWD \
   -e TEST_ORACLE_PWD="$TEST_ORACLE_PWD" \
   -v /${PWD}/oracle:/container-entrypoint-initdb.d \
-  gvenzl/oracle-xe:11.2.0.2-slim-faststart
+  gvenzl/oracle-xe:21.3.0-slim
 ./wait-container-ready.sh test-oracle "DATABASE IS READY TO USE!"
 
 #docker exec -it test-oracle sqlplus sampledb/${TEST_ORACLE_PWD}@XE
diff --git a/setup/oracle/oracle-setup.sh b/setup/oracle/oracle-setup.sh
index fe83dd4..72e1b7f 100644
--- a/setup/oracle/oracle-setup.sh
+++ b/setup/oracle/oracle-setup.sh
@@ -9,6 +9,9 @@ sqlplus system/${TEST_ORACLE_PWD}@XE  <<-EOSQL
   grant create table to tdstorerdb2; 
   grant create procedure to tdstorerdb2; 
   grant create view to tdstorerdb2;
+  -- migration from 11 to 21 requires granting access to tablespace
+  grant unlimited tablespace to tdstorerdb2;
+  
   -- special databases (0 and 1) to check visibility of schemas
   create user tdstorerdb0 identified by "$TEST_ORACLE_PWD" ACCOUNT UNLOCK;
   grant connect to tdstorerdb0;
@@ -18,6 +21,8 @@ sqlplus system/${TEST_ORACLE_PWD}@XE  <<-EOSQL
   grant create procedure to tdstorerdb0; 
   grant create view  to tdstorerdb0; 
   grant dba to tdstorerdb0;
+  grant unlimited tablespace to tdstorerdb0;
+  
   create user tdstorerdb1 identified by "$TEST_ORACLE_PWD" ACCOUNT UNLOCK;
   grant connect to tdstorerdb1;
   grant create session to tdstorerdb1;
@@ -26,5 +31,6 @@ sqlplus system/${TEST_ORACLE_PWD}@XE  <<-EOSQL
   grant create procedure to tdstorerdb1; 
   grant create view  to tdstorerdb1; 
   grant dba to tdstorerdb1;
+  grant unlimited tablespace to tdstorerdb1;
 EOSQL
 echo "-- End setup"