Fixing gaps in uninstall process.

jgebal · jgebal · commit 9010fcb18451 · 2022-02-09T00:31:40.000+02:00
diff --git a/.github/scripts/uninstall_validate_utplsql.sh b/.github/scripts/uninstall_validate_utplsql.sh
@@ -15,6 +15,21 @@ time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
     set feedback off
     set verify off
     whenever sqlerror exit failure rollback
+    set serverout on
+    begin
+      for i in (
+        select o.object_type||' '||o.owner||'.'||o.object_name as obj
+          from dba_objects o
+         where owner = '$UT3_DEVELOP_SCHEMA'
+        union all
+        select 'SYNONYM '||s.owner||'.'||s.synonym_name||' FOR '||s.table_owner||'.'||s.table_name as obj
+          from dba_synonyms s
+         where table_owner = '$UT3_DEVELOP_SCHEMA'
+      ) loop
+        dbms_output.put_line(i.obj);
+      end loop;
+    end;
+    /
     declare
       v_leftover_objects_count integer;
     begin
@@ -34,5 +49,5 @@ time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
       end if;
     end;
     /
-    drop user $UT3_DEVELOP_SCHEMA cascade;
+    drop user $UT3_DEVELOP_SCHEMA;
 SQL
diff --git a/source/expectations/json_objects_specs.sql b/source/expectations/json_objects_specs.sql
@@ -1,18 +1,12 @@
 BEGIN
-
-  $if dbms_db_version.version >= 21 $then
-    dbms_output.put_line('Object exists , dont install');
-  $elsif dbms_db_version.version = 12 and dbms_db_version.release >= 2 or ( dbms_db_version.version > 12 and dbms_db_version.version < 21 ) $then
-    dbms_output.put_line('Installing json structures specs for native json.');
-    execute immediate  q'[create or replace TYPE JSON FORCE AUTHID CURRENT_USER AS OBJECT(
-   dummyobjt NUMBER
-) NOT FINAL NOT INSTANTIABLE;]';   
-  $else  
+  null;
+  $if dbms_db_version.version < 21 $then
     dbms_output.put_line('Installing json structures specs for native json.');
     execute immediate  q'[create or replace TYPE JSON FORCE AUTHID CURRENT_USER AS OBJECT(
    dummyobjt NUMBER
 ) NOT FINAL NOT INSTANTIABLE;]';   
-  
+  $end
+  $if dbms_db_version.version = 12 and dbms_db_version.release = 1 or dbms_db_version.version < 12 $then
     dbms_output.put_line('Installing json structures specs.');
     execute immediate  q'[create or replace TYPE JSON_Element_T FORCE AUTHID CURRENT_USER AS OBJECT(
    dummyobjt NUMBER,
diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql
@@ -156,6 +156,10 @@ drop type ut_comparison_matcher force;
 
 drop type ut_matcher force;
 
+drop type ut_expectation_base force;
+
+drop type ut_matcher_base force;
+
 drop type ut_data_value_yminterval force;
 
 drop type ut_data_value_varchar2 force;
@@ -245,10 +249,15 @@ drop package ut_metadata;
 drop package ut_ansiconsole_helper;
 
 begin
+  null;
+  $if dbms_db_version.version < 21 $then
+    begin execute immediate 'drop type json force'; exception when others then null; end;
+  $end
   $if dbms_db_version.version = 12 and dbms_db_version.release = 1 or dbms_db_version.version < 12 $then
-    execute immediate 'drop type json_element_t force';
-  $else
-    dbms_output.put_line('Nothing to drop');
+    begin execute immediate 'drop type json_element_t force'; exception when others then null; end;
+    begin execute immediate 'drop type json_object_t force'; exception when others then null; end;
+    begin execute immediate 'drop type json_array_t force'; exception when others then null; end;
+    begin execute immediate 'drop type json_key_list force'; exception when others then null; end;
   $end
 end;
 /
