Fixed bad implementation.

jgebal · jgebal · commit 7d6e1b1e4b40 · 2018-03-29T17:59:11.000+01:00
Added removal of SYS-created objects to allow for schema re-create when using develop branch for release.
diff --git a/development/cleanup.sh b/development/cleanup.sh
@@ -7,6 +7,17 @@ git rev-parse && cd "$(git rev-parse --show-cdup)"
 
 "${SQLCLI}" sys/${ORACLE_PWD}@//${CONNECTION_STR} AS SYSDBA <<-SQL
 set echo on
+begin
+  for x in (
+    select * from dba_objects
+     where owner in ( upper('${UT3_RELEASE_VERSION_SCHEMA}'), upper('${UT3_OWNER}') )
+       and object_name like 'SYS_PLSQL%')
+  loop
+    execute immediate 'drop type '||x.owner||'.'||x.object_name||' force';
+  end loop;
+end;
+/
+
 drop user ${UT3_OWNER} cascade;
 drop user ${UT3_RELEASE_VERSION_SCHEMA} cascade;
 drop user ${UT3_TESTER} cascade;
diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb
@@ -109,17 +109,17 @@ create or replace package body ut_annotation_cache_manager as
     pragma autonomous_transaction;
   begin
     if a_object_owner is null and a_object_type is null then
+      l_cache_filter := ':a_object_owner is null and :a_object_type is null';
+      l_filter := l_cache_filter;
+    else
       l_filter :=
-               case when a_object_owner is null then ':a_object_owner is null' else 'object_owner = :a_object_owner' end || '
+      case when a_object_owner is null then ':a_object_owner is null' else 'object_owner = :a_object_owner' end || '
         and '||case when a_object_type is null then ':a_object_type is null' else 'object_type = :a_object_type' end;
       l_cache_filter := ' c.cache_id
            in (select i.cache_id
                  from ut_annotation_cache_info i
                 where '|| l_filter || '
               )';
-    else
-      l_cache_filter := ':a_object_owner is null and :a_object_type is null';
-      l_filter := l_cache_filter;
     end if;
     execute immediate '
       delete from ut_annotation_cache c
