Merge branch 'develop' into codeship

.travis.yml

@@ -22,48 +22,37 @@ env:
   global:
     - UT3_OWNER=ut3
     - UT3_OWNER_PASSWORD=ut3
-    - UT3_OWNER_TABLESPACE=users
     - UT3_USER=ut3_user
     - UT3_USER_PASSWORD=ut3
-    - UT3_USER_TABLESPACE=users
+    - UT3_TABLESPACE=users
     # Target Branch and Directory for Deployment of Docs
     - PAGES_TARGET_BRANCH="gh-pages"
     - PAGES_VERSION_BASE="version3"
     - CACHE_DIR=$HOME/.cache
     # Database Env
     - SQLCLI="$HOME/sqlcl/bin/sql"
     - ORACLE_PWD="oracle"
-    - CONTAINER_IP=""
-    - CONNECTION_STR=""
-    - ORACLE_12cR1SE="12c-se-r1"
-    - ORACLE_11gR2XE="11g-xe-r2"
   matrix:
-    - ORACLE_VERSION=$ORACLE_12cR1SE
-    - ORACLE_VERSION=$ORACLE_11gR2XE
+    - ORACLE_VERSION="12c-se-r1" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1'
+    - ORACLE_VERSION="11g-xe-r2" CONNECTION_STR='127.0.0.1:1521/XE'        DOCKER_OPTIONS='--shm-size=1g'
+    - ORACLE_VERSION="12c-se2-r2-v2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
 
 cache:
+  pip: true
   directories:
     - $CACHE_DIR
+    - node_modules
 
 install:
-  - pip install -r .travis/python_req.txt
-  - npm install -g phantomjs-prebuilt casperjs
+  - pip install mkdocs
   - bash .travis/install_sqlcl.sh
+  - sudo mkdir -p /dev/pdbs
+  - sudo chmod -R 777 /dev/pdbs
   - bash .travis/start_db.sh
 
 script:
-  - CONTAINER_IP=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $ORACLE_VERSION)
-  - test $ORACLE_VERSION = $ORACLE_12cR1SE && CONNECTION_STR="$CONTAINER_IP:1521/ORCLPDB1" || true
-  - test $ORACLE_VERSION = $ORACLE_11gR2XE && CONNECTION_STR="$CONTAINER_IP:1521/XE" || true
-  - bash .travis/create_utplsql_owner.sh
-  - bash .travis/create_utplsql_user.sh
-  - bash .travis/install_libraries.sh
   - bash .travis/install.sh
-  - bash .travis/grant_user.sh
-  - bash .travis/run_examples_as_owner.sh
-  - bash .travis/run_test_as_owner.sh
-  - bash .travis/run_examples_as_user.sh
-  - bash .travis/create_release.sh
+  - bash .travis/run_examples_and_tests.sh
 #  - bash .travis/run_test_as_user.sh
 #  - bash .travis/build_docs.sh
 #  - bash .travis/push_docs_to_gh_pages.sh

.travis/install.sh

@@ -1,16 +1,33 @@
 #!/bin/bash
 
+cd "$(dirname "$(readlink -f "$0")")"
 set -ev
-
-cd source
 #install core of utplsql
-"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR @install.sql $UT3_OWNER
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+pwd
+set feedback off
+set verify off
 
+@../source/create_utplsql_owner.sql $UT3_OWNER $UT3_OWNER_PASSWORD $UT3_TABLESPACE
+--only needed to run unit tests for utplsql v3, not required to run utplsql v3 itself
+grant select any dictionary to $UT3_OWNER;
 
+@../source/create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE
 cd ..
+
+--enable plsql debug
+--cd development
+--@ut_debug_enable.sql
+--cd ..
+
+cd source
+@install.sql $UT3_OWNER
+@create_synonyms_and_grants_for_user.sql $UT3_OWNER $UT3_USER
+cd ..
+
 cd development
-#do style check
-"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR @utplsql_style_check.sql
+conn $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR
+@utplsql_style_check.sql
 
-#enable plsql debug
-#"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR @ut_debug_enable.sql
+exit
+SQL

.travis/install_sqlcl.sh

@@ -6,6 +6,7 @@ cd .travis
 
 # Download if not present on cache dir.
 if [ ! -f $CACHE_DIR/$SQLCL_FILE ]; then
+    npm install -g phantomjs-prebuilt casperjs
     bash download.sh -p sqlcl
     mv $SQLCL_FILE $CACHE_DIR
 else

.travis/run_examples_and_tests.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -ev
+
+"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR <<SQL
+whenever sqlerror exit failure rollback
+whenever oserror exit failure rollback
+
+cd examples
+@RunAllExamplesAsTests.sql
+
+conn $UT3_USER/$UT3_USER_PASSWORD@//$CONNECTION_STR
+@RunUserExamples.sql
+
+exit
+
+SQL
+
+"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR <<SQL
+cd tests
+@RunAll.sql
+exit
+SQL

.travis/start_db.sh

@@ -12,16 +12,6 @@ else
     mkdir -p $HOME/.docker && cp $CACHE_DIR/.docker/config.json $HOME/.docker/
 fi
 
-# Oracle 12c R1 SE
-if [ "$ORACLE_VERSION" == "$ORACLE_12cR1SE" ]; then
-    docker pull $DOCKER_BASE_TAG:$ORACLE_12cR1SE
-    docker run -d --name $ORACLE_VERSION -p 1521:1521 $DOCKER_BASE_TAG:$ORACLE_12cR1SE
-    docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
-fi
-
-# Oracle 11g R2 XE
-if [ "$ORACLE_VERSION" == "$ORACLE_11gR2XE" ]; then
-    docker pull $DOCKER_BASE_TAG:$ORACLE_11gR2XE
-    docker run -d --name $ORACLE_VERSION --shm-size=1g -p 1521:1521 $DOCKER_BASE_TAG:$ORACLE_11gR2XE
-    docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
-fi
+docker pull $DOCKER_BASE_TAG:$ORACLE_VERSION
+docker run -d --name $ORACLE_VERSION $DOCKER_OPTIONS -p 1521:1521 $DOCKER_BASE_TAG:$ORACLE_VERSION
+docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered

development/utplsql_style_check.sql

@@ -50,7 +50,7 @@ select i.name, i.type, i.object_name, i.object_type, i.usage, i.line, i.col, cou
 ;
 
 
-exec  :errcnt := nvl('&errcnt_a',0) + nvl('&errcnt_l',0) + nvl('&errcnt_c',0); 
+exec  :errcnt := nvl('&errcnt_a',0) + nvl('&errcnt_l',0) + nvl('&errcnt_c',0);
 
 --quit :errcnt
-exit success
+-- exit success

examples/RunAllExamplesAsTests.sql

@@ -3,4 +3,3 @@ whenever oserror exit failure rollback
 
 @@RunAllExamples.sql
 
-exit success

source/core/types/ut_suite_item.tpb

@@ -58,7 +58,7 @@ create or replace type body ut_suite_item as
     return l_savepoint;
   end;
 
-  member procedure rollback_to_savepoint(self in ut_suite_item, a_savepoint varchar2) is
+  member procedure rollback_to_savepoint(self in out nocopy ut_suite_item, a_savepoint varchar2) is
     ex_savepoint_not_exists exception;
     pragma exception_init(ex_savepoint_not_exists, -1086);
   begin
@@ -67,7 +67,7 @@ create or replace type body ut_suite_item as
     end if;
   exception
     when ex_savepoint_not_exists then
-      null;
+      put_warning('Savepoint not established. Implicit commit might have occured.');
   end;
 
   member function execution_time return number is

source/core/types/ut_suite_item.tps

@@ -23,7 +23,7 @@ create or replace type ut_suite_item force under ut_suite_item_base (
   member procedure set_disabled_flag(self in out nocopy ut_suite_item, a_disabled_flag boolean),
   member function get_disabled_flag return boolean,
   member function create_savepoint_if_needed return varchar2,
-  member procedure rollback_to_savepoint(self in ut_suite_item, a_savepoint varchar2),
+  member procedure rollback_to_savepoint(self in out nocopy ut_suite_item, a_savepoint varchar2),
   member function execution_time return number,
 
   not instantiable member function  do_execute(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base) return boolean,

source/install.sql

@@ -17,6 +17,7 @@
 prompt Installing utplsql framework
 
 set serveroutput on size unlimited
+set feedback on
 set timing off
 set verify off
 set define &
@@ -264,5 +265,3 @@ end;
 /
 
 spool off
-
-exit success

source/reporters/ut_teamcity_reporter.tpb

@@ -89,8 +89,8 @@ create or replace type body ut_teamcity_reporter is
                                                                 ,a_out       => trim(l_std_err_msg)));
         self.print_text(ut_teamcity_reporter_helper.test_failed(a_test_name => l_test_full_name
                                                                ,a_msg       => 'Error occured'
-                                                               ,a_details   => trim(l_std_err_msg) || a_test.results(1)
-                                                                              .message));
+                                                               ,a_details   => trim(l_std_err_msg) || case when a_test.results is not null and a_test.results.count>0 then a_test.results(1)
+                                                                              .message end));
       elsif a_test.results is not null and a_test.results.count > 0 then
         for i in 1 .. a_test.results.count loop
 

tests/RunAll.sql

@@ -164,6 +164,7 @@ exec ut_coverage.coverage_start_develop();
 @@lib/RunTest.sql ut_test/ut_test.BeforeEachProcedureNameNull.sql
 @@lib/RunTest.sql ut_test/ut_test.TestOutputGathering.sql
 @@lib/RunTest.sql ut_test/ut_test.TestOutputGatheringForTeamcity.sql
+@@lib/RunTest.sql ut_test/ut_test.ReportWarningOnRollbackFailed.sql
 
 @@lib/RunTest.sql ut_test_suite/ut_test_suite.ErrorsATestWhenAfterTestFails.sql
 @@lib/RunTest.sql ut_test_suite/ut_test_suite.ErrorsATestWhenBeforeTestFails.sql
@@ -439,9 +440,9 @@ begin
   ut_coverage.coverage_stop_develop();
 
   --run for the second time to get the coverage report
-  l_reporter := ut_coverage_html_reporter( a_project_name => 'utPLSQL v3', a_file_paths => l_file_list );
-  :html_reporter_id := l_reporter.reporter_id;
-  l_reporter.after_calling_run(ut_run(ut_suite_items()));
+--   l_reporter := ut_coverage_html_reporter( a_project_name => 'utPLSQL v3', a_file_paths => l_file_list );
+--   :html_reporter_id := l_reporter.reporter_id;
+--   l_reporter.after_calling_run(ut_run(ut_suite_items()));
 
   l_reporter := ut_coverage_sonar_reporter( a_file_paths => l_file_list );
   :sonar_reporter_id := l_reporter.reporter_id;
@@ -469,12 +470,12 @@ spool coverage.json
 select * from table(ut_output_buffer.get_lines(:coveralls_reporter_id));
 spool off
 
-set termout on
-prompt Spooling outcomes to coverage.html
-set termout off
-spool coverage.html
-exec ut_output_buffer.lines_to_dbms_output(:html_reporter_id);
-spool off
+-- set termout on
+-- prompt Spooling outcomes to coverage.html
+-- set termout off
+-- spool coverage.html
+-- exec ut_output_buffer.lines_to_dbms_output(:html_reporter_id);
+-- spool off
 
 @@lib/mystats/mystats stop t=1000