Merge pull request #466 from pesse/fix/cursor_on_temp_table

jgebal · web-flow · commit cdd22c06f623 · 2017-08-24T20:34:53.000+01:00
Removed autonomous_transaction from cursor init
diff --git a/.travis/run_examples.sh b/.travis/run_examples.sh
@@ -9,9 +9,6 @@ whenever oserror exit failure rollback
 cd examples
 @RunAllExamplesAsTests.sql
 
-conn $UT3_USER/$UT3_USER_PASSWORD@//$CONNECTION_STR
-@RunUserExamples.sql
-
 exit
 
 SQL
diff --git a/examples/RunAllExamples.sql b/examples/RunAllExamples.sql
@@ -1,5 +1,4 @@
 PROMPT Run all examples
-Clear Screen
 set echo off
 set feedback off
 set linesize 1000
diff --git a/examples/RunDeveloperExamples.sql b/examples/RunDeveloperExamples.sql
@@ -4,7 +4,7 @@ set echo off
 set feedback off
 set linesize 1000
 
-exec ut_documentation_reporter.set_color_enabled(true);
+exec ut_ansiconsole_helper.color_enabled(true);
 --developer examples
 prompt RunExampleComplexSuiteWithCustomReporter
 @@developer_examples/RunExampleComplexSuiteWithCustomReporter.sql
diff --git a/examples/RunUserExamples.sql b/examples/RunUserExamples.sql
@@ -1,12 +1,11 @@
 PROMPT Run user examples
-Clear Screen
---set echo off
---set feedback off
+set echo off
+set feedback off
 set linesize 1000
 
 prompt Common examples from web
 
-exec ut_documentation_reporter.set_color_enabled(true);
+exec ut_ansiconsole_helper.color_enabled(true);
 @@award_bonus/run_award_bonus_test.sql
 
 @@between_string/run_betwnstr_test.sql
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -378,10 +378,8 @@ create or replace package body ut_utils is
   end;
 
   procedure cleanup_temp_tables is
-    pragma autonomous_transaction;
   begin
-    execute immediate 'truncate table ut_cursor_data';
-    commit;
+    execute immediate 'delete from ut_cursor_data';
   end;
 
 end ut_utils;
diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb
@@ -41,7 +41,6 @@ create or replace type body ut_data_value_refcursor as
     l_xml                 xmltype;
     c_bulk_rows  constant integer := 1000;
     l_current_date_format varchar2(4000);
-    pragma autonomous_transaction;
   begin
     self.is_cursor_null := ut_utils.boolean_to_int(a_value is null);
     self.self_type  := $$plsql_unit;
@@ -83,15 +82,13 @@ create or replace type body ut_data_value_refcursor as
       end if;
       dbms_xmlgen.closeContext(l_ctx);
     end if;
-    commit;
   exception
     when others then
       ut_expectation_processor.reset_nls_params();
       if a_value%isopen then
         close a_value;
       end if;
       dbms_xmlgen.closeContext(l_ctx);
-      rollback;
       raise;
   end;
 
diff --git a/test/install_tests.sql b/test/install_tests.sql
@@ -8,6 +8,7 @@
 @@ut_reporters/test_coverage.pks
 @@ut_reporters/test_coverage_sonar_reporter.pks
 @@ut_reporters/test_coveralls_reporter.pks
+@ut_expectations/test_expectations_cursor.pks
 
 @core.pkb
 @ut_utils/test_ut_utils.pkb
@@ -18,6 +19,7 @@
 @@ut_reporters/test_coverage.pkb
 @@ut_reporters/test_coverage_sonar_reporter.pkb
 @@ut_reporters/test_coveralls_reporter.pkb
+@ut_expectations/test_expectations_cursor.pkb
 
 show errors
 
diff --git a/test/ut_expectations/test_expectations_cursor.pkb b/test/ut_expectations/test_expectations_cursor.pkb
@@ -0,0 +1,45 @@
+create or replace package body test_expectations_cursor is
+
+  procedure setup_temp_table_test
+  as
+    pragma autonomous_transaction;
+  begin
+    execute immediate 'create global temporary table gtt_test_table (
+        value varchar2(250)
+      ) on commit delete rows';
+
+  end;
+
+  procedure cleanup_temp_table_test
+  as
+    pragma autonomous_transaction;
+  begin
+    execute immediate 'drop table gtt_test_table';
+  end;
+
+  procedure test_cursor_w_temp_table
+  as
+    pragma autonomous_transaction;
+    c_expected sys_refcursor;
+    c_actual sys_refcursor;
+  begin
+
+    -- Arrange
+    execute immediate 'insert into gtt_test_table ( value ) values ( ''Test-entry'' )';
+
+    open c_expected for select 'Test-entry' as value from dual;
+    open c_actual for 'select * from gtt_test_table';
+    
+    --Act - execute the expectation on cursor opened on GTT
+    ut3.ut.expect( c_actual ).to_equal( a_expected => c_expected );
+    
+    --Assert - check that expectation was executed successfully
+    ut.expect(ut3.ut_expectation_processor.get_status()).to_equal(ut3.ut_utils.tr_success);
+    
+    --Cleanup
+    ut3.ut_expectation_processor.clear_expectations();
+
+    rollback;
+  end;
+end;
+/
diff --git a/test/ut_expectations/test_expectations_cursor.pks b/test/ut_expectations/test_expectations_cursor.pks
@@ -0,0 +1,15 @@
+create or replace package test_expectations_cursor is
+
+  --%suite(expectations - cursor)
+  --%suitepath(utplsql.core.expectations.cursor)
+
+  
+  procedure setup_temp_table_test;
+  procedure cleanup_temp_table_test;
+  
+  --%test(Test cursor on temporary table)
+  --%beforetest(setup_temp_table_test)
+  --%aftertest(cleanup_temp_table_test)
+  procedure test_cursor_w_temp_table;
+end;
+/

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`PROMPT Run all examples`
`2`		`-Clear Screen`
`3`	`2`	`set echo off`
`4`	`3`	`set feedback off`
`5`	`4`	`set linesize 1000`