Fix llogger templates bug wherein the %delete_procedure% appeared in all templates,

avalon60 · avalon60 · commit 26f9e82df332 · 2025-03-07T14:18:12.000Z
diff --git a/resources/templates/packages/body/package_footer.tpt b/resources/templates/packages/body/package_footer.tpt
@@ -1,2 +1,2 @@
 end %tapi_pkg_name_prefix%%table_name_lc%%tapi_pkg_name_postfix%;
-/
+/
diff --git a/resources/templates/packages/body/package_header.tpt b/resources/templates/packages/body/package_header.tpt
@@ -12,16 +12,19 @@ as
 -- Source file name :   %tapi_pkg_name_prefix%%table_name_lc%%tapi_pkg_name_postfix%%spec_file_ext%
 -- Purpose          :   Table API (TAPI) for table %table_name_lc%
 --
--- Notes            :   Generated using OraTAPI, by %tapi_author% on %run_date_time%.
---                  :   From basic sample
+-- HAS COMMITS      :   NO
+-- HAS ROLLBACKS    :   NO
+--
+-- Notes            :   Generated using OraTAPI %version%
+--           `      :   Generated by %tapi_author% on %run_date_time%
+--  
 --------------------------------------------------------------------------------
 
 --------------------------------------------------------------------------------
---< PRIVATE TYPES AND GLOBALS >-------------------------------------------------
---------------------------------------------------------------------------------
+--< PUBLIC TYPES AND GLOBALS >--------------------------------------------------
+
+%STAB%gc_unit_prefix       constant varchar(64) := lower($$pls_unit) || '.';
 
---------------------------------------------------------------------------------
---< PRIVATE METHODS >-----------------------------------------------------------
 --------------------------------------------------------------------------------
 
 --------------------------------------------------------------------------------
diff --git a/resources/templates/packages/procedures/delete.tpt b/resources/templates/packages/procedures/delete.tpt
@@ -1,16 +1,25 @@
 %procedure_signature%
 
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%delete_procname%';
+%STAB%%STAB%l_params          %logger_pkg%.tab_param;
+
 %STAB%begin
 
+%STAB%%STAB%-- We don't log any CLOB parameters here.
+%STAB%%STAB%%logger_params_append_lc%
+%STAB%%STAB%logger.log('START', l_scope, null, l_params);
+
 %STAB%%STAB%  delete
 %STAB%%STAB%%STAB% from %table_name_lc%
 %STAB%%STAB%%STAB%where
 %STAB%%STAB%%STAB%%STAB%%key_predicates_string_lc%
 %STAB%%STAB%%returning_clause_lc%;
 
--- %STAB%%STAB%%STAB%if sql%rowcount = 0
--- %STAB%%STAB%%STAB%then
--- %STAB%%STAB%%STAB%%STAB%raise NO_DATA_FOUND;
--- %STAB%%STAB%%STAB%end if;
+%STAB%%STAB%logger.log('END', l_scope);
+
+%STAB%exception
+%STAB%%STAB%when others then
+%STAB%%STAB%%STAB%%logger_pkg%.log_error('Unhandled exception ', l_scope, null, l_params);
+%STAB%%STAB%%STAB%raise;
 
-%STAB%end %procedure_name%;
+%STAB%end %procedure_name%;
diff --git a/resources/templates/packages/procedures/insert.tpt b/resources/templates/packages/procedures/insert.tpt
@@ -1,6 +1,14 @@
 %procedure_signature%
+
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%insert_procname%';
+%STAB%%STAB%l_params          %logger_pkg%.tab_param;
+
 %STAB%begin
 
+%STAB%%STAB%-- We don't log any CLOB parameters here.
+%STAB%%STAB%%logger_params_append_lc%
+%STAB%%STAB%logger.log('START', l_scope, null, l_params);
+
 %STAB%%STAB%insert into %table_name_lc%
 %STAB%%STAB%%STAB%(
 %STAB%%STAB%%STAB%%STAB%%column_list_string_lc%
@@ -11,4 +19,11 @@
 %STAB%%STAB%%STAB%)
 %STAB%%STAB%%returning_clause_lc%;
 
-%STAB%end %procedure_name%;
+%STAB%%STAB%logger.log('END', l_scope);
+
+%STAB%exception
+%STAB%%STAB%when others then
+%STAB%%STAB%%STAB%%logger_pkg%.log_error('Unhandled exception ', l_scope, null, l_params);
+%STAB%%STAB%%STAB%raise;
+
+%STAB%end %procedure_name%;
diff --git a/resources/templates/packages/procedures/merge.tpt b/resources/templates/packages/procedures/merge.tpt
@@ -1,6 +1,14 @@
 %procedure_signature%
+
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%merge_procname%';
+%STAB%%STAB%l_params          %logger_pkg%.tab_param;
+
 %STAB%begin
 
+%STAB%%STAB%-- We don't log any CLOB parameters here.
+%STAB%%STAB%%logger_params_append_lc%
+%STAB%%STAB%logger.log('START', l_scope, null, l_params);
+
 %STAB%%STAB%merge into %table_name_lc% tgt
 %STAB%%STAB%using (
 %STAB%%STAB%%STAB%%STAB%select
@@ -24,4 +32,11 @@
 %STAB%%STAB%%STAB%%STAB%%STAB%%mrg_src_column_list_string_lc%
 %STAB%%STAB%%STAB%%STAB%);
 
-%STAB%end %procedure_name%;
+%STAB%%STAB%logger.log('END', l_scope);
+
+%STAB%exception
+%STAB%%STAB%when others then
+%STAB%%STAB%%STAB%%logger_pkg%.log_error('Unhandled exception ', l_scope, null, l_params);
+%STAB%%STAB%%STAB%raise;
+
+%STAB%end %procedure_name%;
diff --git a/resources/templates/packages/procedures/samples/insert.llogger.sample b/resources/templates/packages/procedures/samples/insert.llogger.sample
@@ -1,6 +1,6 @@
 %procedure_signature%
 
-%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%delete_procname%';
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%insert_procname%';
 %STAB%%STAB%l_params          %logger_pkg%.tab_param;
 
 %STAB%begin
diff --git a/resources/templates/packages/procedures/samples/insert.logger.sample b/resources/templates/packages/procedures/samples/insert.logger.sample
@@ -1,6 +1,6 @@
 %procedure_signature%
 
-%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%delete_procname%';
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%insert_procname%';
 %STAB%%STAB%l_params          %logger_pkg%.tab_param;
 
 %STAB%begin
diff --git a/resources/templates/packages/procedures/samples/merge.llogger.sample b/resources/templates/packages/procedures/samples/merge.llogger.sample
@@ -1,6 +1,6 @@
 %procedure_signature%
 
-%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%delete_procname%';
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%merge_procname%';
 %STAB%%STAB%l_params          %logger_pkg%.tab_param;
 
 %STAB%begin
diff --git a/resources/templates/packages/procedures/samples/merge.logger.sample b/resources/templates/packages/procedures/samples/merge.logger.sample
@@ -1,6 +1,6 @@
 %procedure_signature%
 
-%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%delete_procname%';
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%merge_procname%';
 %STAB%%STAB%l_params          %logger_pkg%.tab_param;
 
 %STAB%begin
diff --git a/resources/templates/packages/procedures/samples/select.llogger.sample b/resources/templates/packages/procedures/samples/select.llogger.sample
@@ -1,6 +1,6 @@
 %procedure_signature%
 
-%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%delete_procname%';
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%select_procname%';
 %STAB%%STAB%l_params          %logger_pkg%.tab_param;
 
 %STAB%begin
diff --git a/resources/templates/packages/procedures/samples/select.logger.sample b/resources/templates/packages/procedures/samples/select.logger.sample
@@ -1,6 +1,6 @@
 %procedure_signature%
 
-%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%delete_procname%';
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%select_procname%';
 %STAB%%STAB%l_params          %logger_pkg%.tab_param;
 
 %STAB%begin
diff --git a/resources/templates/packages/procedures/samples/update.llogger.sample b/resources/templates/packages/procedures/samples/update.llogger.sample
@@ -1,6 +1,6 @@
 %procedure_signature%
 
-%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%delete_procname%';
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%update_procname%';
 %STAB%%STAB%l_params          %logger_pkg%.tab_param;
 
 %STAB%begin
diff --git a/resources/templates/packages/procedures/samples/update.logger.sample b/resources/templates/packages/procedures/samples/update.logger.sample
@@ -1,6 +1,6 @@
 %procedure_signature%
 
-%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%delete_procname%';
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%update_procname%';
 %STAB%%STAB%l_params          %logger_pkg%.tab_param;
 
 %STAB%begin
diff --git a/resources/templates/packages/procedures/samples/upsert.llogger.sample b/resources/templates/packages/procedures/samples/upsert.llogger.sample
@@ -1,6 +1,6 @@
 %procedure_signature%
 
-%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%delete_procname%';
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%upsert_procname%';
 %STAB%%STAB%l_params          %logger_pkg%.tab_param;
 
 %STAB%begin
diff --git a/resources/templates/packages/procedures/samples/upsert.logger.sample b/resources/templates/packages/procedures/samples/upsert.logger.sample
@@ -1,6 +1,6 @@
 %procedure_signature%
 
-%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%delete_procname%';
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%upsert_procname%';
 %STAB%%STAB%l_params          %logger_pkg%.tab_param;
 
 %STAB%begin
diff --git a/resources/templates/packages/procedures/select.tpt b/resources/templates/packages/procedures/select.tpt
@@ -1,6 +1,14 @@
 %procedure_signature%
+
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%select_procname%';
+%STAB%%STAB%l_params          %logger_pkg%.tab_param;
+
 %STAB%begin
 
+%STAB%%STAB%-- We don't log any CLOB parameters here.
+%STAB%%STAB%%logger_params_append_lc%
+%STAB%%STAB%logger.log('START', l_scope, null, l_params);
+
 %STAB%%STAB%select
 %STAB%%STAB%%STAB%%column_list_string_lc%
 %STAB%%STAB%  into
@@ -9,4 +17,11 @@
 %STAB%%STAB%where
 %STAB%%STAB%%STAB%%key_predicates_string_lc%;
 
-%STAB%end %procedure_name%;
+%STAB%%STAB%logger.log('END', l_scope);
+
+%STAB%exception
+%STAB%%STAB%when others then
+%STAB%%STAB%%STAB%%logger_pkg%.log_error('Unhandled exception ', l_scope, null, l_params);
+%STAB%%STAB%%STAB%raise;
+
+%STAB%end %procedure_name%;
diff --git a/resources/templates/packages/procedures/update.tpt b/resources/templates/packages/procedures/update.tpt
@@ -1,11 +1,26 @@
 %procedure_signature%
+
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%update_procname%';
+%STAB%%STAB%l_params          %logger_pkg%.tab_param;
+
 %STAB%begin
 
+%STAB%%STAB%-- We don't log any CLOB parameters here.
+%STAB%%STAB%%logger_params_append_lc%
+%STAB%%STAB%logger.log('START', l_scope, null, l_params);
+
 %STAB%%STAB%update %table_name_lc%
 %STAB%%STAB%set
 %STAB%%STAB%%STAB% %update_assignments_string_lc%
 %STAB%%STAB%where
 %STAB%%STAB%%STAB%%key_predicates_string_lc%
 %STAB%%STAB%%returning_clause_lc%;
 
+%STAB%%STAB%logger.log('END', l_scope);
+
+%STAB%exception
+%STAB%%STAB%when others then
+%STAB%%STAB%%STAB%%logger_pkg%.log_error('Unhandled exception ', l_scope, null, l_params);
+%STAB%%STAB%%STAB%raise;
+
 %STAB%end %procedure_name%;
diff --git a/resources/templates/packages/procedures/upsert.tpt b/resources/templates/packages/procedures/upsert.tpt
@@ -1,13 +1,28 @@
 %procedure_signature%
+
+%STAB%%STAB%l_scope           %logger_logs%.scope%type    := gc_unit_prefix || '%upsert_procname%';
+%STAB%%STAB%l_params          %logger_pkg%.tab_param;
+
 %STAB%begin
 
+%STAB%%STAB%-- We don't log any CLOB parameters here.
+%STAB%%STAB%%logger_params_append_lc%
+%STAB%%STAB%logger.log('START', l_scope, null, l_params);
+
 %STAB%%STAB%update %table_name_lc%
 %STAB%%STAB%set
 %STAB%%STAB%%STAB% %update_assignments_string_lc%
 %STAB%%STAB%where
 %STAB%%STAB%%STAB%%key_predicates_string_lc%
 %STAB%%STAB%%upd_returning_clause_lc%;
 
+%STAB%%STAB%update %table_name_lc%
+%STAB%%STAB%set
+%STAB%%STAB%%STAB% %update_assignments_string_lc%
+%STAB%%STAB%where
+%STAB%%STAB%%STAB%%key_predicates_string_lc%
+%STAB%%STAB%%ins_returning_clause_lc%;
+
 %STAB%%STAB%if sql%rowcount = 0
 %STAB%%STAB%then
 %STAB%%STAB%%STAB%insert into %table_name_lc%
@@ -21,4 +36,11 @@
 %STAB%%STAB%%STAB%%ins_returning_clause_lc%;
 %STAB%%STAB%end if;
 
-%STAB%end %procedure_name%;
+%STAB%%STAB%logger.log('END', l_scope);
+
+%STAB%exception
+%STAB%%STAB%when others then
+%STAB%%STAB%%STAB%%logger_pkg%.log_error('Unhandled exception ', l_scope, null, l_params);
+%STAB%%STAB%%STAB%raise;
+
+%STAB%end %procedure_name%;
diff --git a/resources/templates/packages/spec/package_header.tpt b/resources/templates/packages/spec/package_header.tpt
@@ -16,7 +16,8 @@ as
 -- HAS COMMITS      :   NO
 -- HAS ROLLBACKS    :   NO
 --
--- Notes            :   Generated by %tapi_author% on %run_date_time%
+-- Notes            :   Generated using OraTAPI %version%
+--           `      :   Generated by %tapi_author% on %run_date_time%
 --  
 --------------------------------------------------------------------------------
 
@@ -31,4 +32,3 @@ as
 
 --------------------------------------------------------------------------------
 --< PUBLIC METHODS >------------------------------------------------------------
-
diff --git a/resources/templates/ut_packages/body/package_footer.tpt b/resources/templates/ut_packages/body/package_footer.tpt
@@ -1,4 +1,3 @@
 
 end %ut_pkg_name_prefix_lc%%table_name_lc%%ut_pkg_name_postfix_lc%;
 /
---rollback drop package %package_owner_lc%.%ut_pkg_name_prefix_lc%%table_name_lc%%ut_pkg_name_postfix_lc%
diff --git a/resources/templates/ut_packages/body/package_header.tpt b/resources/templates/ut_packages/body/package_header.tpt
@@ -1,7 +1,3 @@
---liquibase formatted sql
-
---changeset %tapi_author%:%ut_pkg_name_prefix_lc%%table_name_lc%%ut_pkg_name_postfix_lc%_create_body stripComments:false endDelimiter:/ runOnChange:true
-
 create or replace package body %package_owner_lc%.%ut_pkg_name_prefix_lc%%table_name_lc%%ut_pkg_name_postfix_lc%
 as
 --------------------------------------------------------------------------------
@@ -21,12 +17,14 @@ as
 --
 -- Notes            :   Generated using OraTAPI %version%
 --                  :   Generated by %tapi_author% on %run_date_time%
---
+--  
 --------------------------------------------------------------------------------
 
 --------------------------------------------------------------------------------
 --< PUBLIC TYPES AND GLOBALS >--------------------------------------------------
 
+%STAB%gc_unit_prefix       constant varchar(64) := lower($$pls_unit) || '.';
+
 --------------------------------------------------------------------------------
 
 --------------------------------------------------------------------------------
diff --git a/resources/templates/ut_packages/spec/package_footer.tpt b/resources/templates/ut_packages/spec/package_footer.tpt
@@ -7,4 +7,3 @@
 
 end %ut_pkg_name_prefix_lc%%table_name_lc%%ut_pkg_name_postfix_lc%;
 /
---rollback drop package %package_owner_lc%.%ut_pkg_name_prefix_lc%%table_name_lc%%ut_pkg_name_postfix_lc%
diff --git a/resources/templates/ut_packages/spec/package_header.tpt b/resources/templates/ut_packages/spec/package_header.tpt
@@ -1,7 +1,3 @@
---liquibase formatted sql
-
---changeset %tapi_author%:%ut_pkg_name_prefix_lc%%table_name_lc%%ut_pkg_name_postfix_lc%_create_spec stripComments:false endDelimiter:/ runOnChange:true
-
 create or replace package %package_owner_lc%.%ut_pkg_name_prefix_lc%%table_name_lc%%ut_pkg_name_postfix_lc%
 authid definer
 as
@@ -29,7 +25,7 @@ as
 %STAB%--%suite(%ut_suite%)
 
 %STAB%/* Constructed as a namespace hierarchy, delimited by dot - affects the report layout)
-%STAB%--%suitepath(%ut_prod_code_lc%.%ut_prod_sub_domain_code_lc%)
+%STAB%--%suitepath(%ut_prod_code_lc%.%ut_prod_sub_domain_code%)
 
 %STAB%/* human readable form of what the suite covers */
 %STAB%-- %displayname(%table_name_lc% TAPIs)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`end %tapi_pkg_name_prefix%%table_name_lc%%tapi_pkg_name_postfix%;`
`2`		`-/`
	`2`	`+/`