Merge pull request #1093 from utPLSQL/feature/fix_ddl_trigger_parsing

jgebal · web-flow · commit 74b77b5851a6 · 2020-08-09T14:32:23.000+01:00
Fixes to DDL Trigger annotation parsing on 11g
diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb
@@ -246,6 +246,9 @@ create or replace package body ut_annotation_manager as
         -- remove the "create [or replace] [[non]editionable] " so that we have only "type|package" for parsing
         -- needed for dbms_preprocessor
         l_sql_clob := regexp_replace(l_sql_clob, '^(.*?\s*create(\s+or\s+replace)?(\s+(editionable|noneditionable))?\s+?)((package|type).*)', '\5', 1, 1, 'ni');
+        -- remove "OWNER." from create or replace statement.
+        -- Owner is not supported along with AUTHID - see issue https://github.com/utPLSQL/utPLSQL/issues/1088
+        l_sql_clob := regexp_replace(l_sql_clob, '^(package|type)\s+("?[a-zA-Z][a-zA-Z0-9#_$]*"?\.)(.*)', '\1 \3', 1, 1, 'ni');
         l_sql_lines := ut_utils.convert_collection( ut_utils.clob_to_table(l_sql_clob) );
       end if;
       open l_result for
diff --git a/test/ut3_tester_helper/annotation_cache_helper.pkb b/test/ut3_tester_helper/annotation_cache_helper.pkb
@@ -4,7 +4,7 @@ create or replace package body annotation_cache_helper as
     pragma autonomous_transaction;
   begin
     execute immediate
-      'create or replace package ut3_cache_test_owner.granted_test_suite is
+      'create or replace package ut3_cache_test_owner.granted_test_suite authid definer is
         --%suite
 
         --%test
@@ -19,7 +19,7 @@ create or replace package body annotation_cache_helper as
         procedure test2 is begin ut3_develop.ut.expect( 1 ).to_equal( 1 ); end;
         end;';
     execute immediate
-      'create or replace package ut3_cache_test_owner.not_granted_test_suite is
+      'create or replace package ut3_cache_test_owner.not_granted_test_suite authid definer is
         --%suite
 
         --%test
@@ -54,7 +54,7 @@ create or replace package body annotation_cache_helper as
     pragma autonomous_transaction;
   begin
     execute immediate
-      'create or replace package ut3_cache_test_owner.new_suite is
+      'create or replace package ut3_cache_test_owner.new_suite authid definer is
         --%suite
 
         --%test
