Fixed some merge issues

pesse · pesse · commit a9031f40d4ea · 2018-02-12T12:16:57.000+01:00
diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb
@@ -33,11 +33,10 @@ create or replace package body ut_runner is
     return l_result;
   end;
 
-  procedure finish_run(a_reporters ut_reporters) is
+  procedure finish_run(l_listener ut_event_listener) is
   begin
     ut_utils.cleanup_temp_tables;
-    -- TODO: Not needed anymore?
-    ut_output_buffer.close(a_reporters);
+    l_listener.fire_on_event(ut_utils.gc_finalize);
     ut_metadata.reset_source_definition_cache;
     ut_utils.read_cache_to_dbms_output();
     ut_coverage_helper.cleanup_tmp_table();
@@ -93,11 +92,10 @@ create or replace package body ut_runner is
       );
       l_items_to_run.do_execute(l_listener);
 
-      finish_run(l_listener.reporters);
+      finish_run(l_listener);
     exception
       when others then
-        finish_run(l_listener.reporters);
-        l_listener.fire_on_event(ut_utils.gc_finalize);
+        finish_run(l_listener);
         dbms_output.put_line(dbms_utility.format_error_backtrace);
         dbms_output.put_line(dbms_utility.format_error_stack);
         raise;
diff --git a/source/core/output_buffers/ut_output_buffer_base.tps b/source/core/output_buffers/ut_output_buffer_base.tps
@@ -1,6 +1,6 @@
 create or replace type ut_output_buffer_base authid definer as object(
   /*
-  utPLSQL - Version X.X.X.X
+  utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
 
   Licensed under the Apache License, Version 2.0 (the "License"):
diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb
@@ -1,6 +1,6 @@
 create or replace type body ut_output_table_buffer is
   /*
-  utPLSQL - Version X.X.X.X
+  utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
 
   Licensed under the Apache License, Version 2.0 (the "License"):
diff --git a/source/core/output_buffers/ut_output_table_buffer.tps b/source/core/output_buffers/ut_output_table_buffer.tps
@@ -1,6 +1,6 @@
 create or replace type ut_output_table_buffer under ut_output_buffer_base (
   /*
-  utPLSQL - Version X.X.X.X
+  utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
 
   Licensed under the Apache License, Version 2.0 (the "License"):
diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb
@@ -1,6 +1,6 @@
 create or replace type body ut_output_reporter_base is
   /*
-  utPLSQL - Version X.X.X.X
+  utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
 
   Licensed under the Apache License, Version 2.0 (the "License"):
diff --git a/source/core/types/ut_output_reporter_base.tps b/source/core/types/ut_output_reporter_base.tps
@@ -1,6 +1,6 @@
 create or replace type ut_output_reporter_base under ut_reporter_base(
   /*
-  utPLSQL - Version X.X.X.X
+  utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
 
   Licensed under the Apache License, Version 2.0 (the "License"):
diff --git a/source/install.sql b/source/install.sql
@@ -75,7 +75,6 @@ alter session set current_schema = &&ut3_owner;
 --output buffer table
 @@install_component.sql 'core/output_buffers/ut_output_buffer_info_tmp.sql'
 @@install_component.sql 'core/output_buffers/ut_output_buffer_tmp.sql'
-@@install_component.sql 'core/output_buffers/ut_message_id_seq.sql'
 --output buffer table api
 @@install_component.sql 'core/output_buffers/ut_output_table_buffer.tps'
 @@install_component.sql 'core/output_buffers/ut_output_table_buffer.tpb'
