Merge pull request #1165 from utPLSQL/release/v3.1.11

Preparing for Release v3.1.11

.github/ISSUE_TEMPLATE/feature_request.md

@@ -23,4 +23,4 @@ Add any other context or screenshots about the feature request here.
 > Please do not create issues for generic SQL or PL/SQL questions. There are other forums and communities to help you with those. See [ASKTom](https://asktom.oracle.com) for example.
 
 **Want to discuss**
-If you want to discuss your issue, join [our SLACK chat](http://utplsql-slack-invite.herokuapp.com/).
+If you want to discuss your issue, join [our SLACK chat](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA).

.travis.yml

@@ -1,12 +1,10 @@
 sudo: required
 language: python
+os: linux
+
+jdk: openjdk10
 
 addons:
- apt:
- packages:
- - unzip
- # Java9+ Required for Sonar and SQLCL
- - openjdk-9-jre-headless
  sonarcloud:
  organization: utplsql
  token: ${SONAR_TOKEN}
@@ -16,16 +14,26 @@ services:
 
 env:
  global:
- - UT3_OWNER=ut3
- - UT3_OWNER_PASSWORD=ut3
- - UT3_RELEASE_VERSION_SCHEMA=UT3_LATEST_RELEASE
+ - UT3_DEVELOP_SCHEMA=UT3_DEVELOP
+ - UT3_DEVELOP_SCHEMA_PASSWORD=ut3
+ - UT3_RELEASE_VERSION_SCHEMA=UT3
+ - UT3_RELEASE_VERSION_SCHEMA_PASSWORD=ut3
  - UT3_USER="UT3\$USER#"
  - UT3_USER_PASSWORD=ut3
- - UT3_TESTER=ut3_tester
+ - UT3_TESTER=UT3_TESTER
  - UT3_TESTER_PASSWORD=ut3
- - UT3_TESTER_HELPER=ut3_tester_helper
+ - UT3_TESTER_HELPER=UT3_TESTER_HELPER
  - UT3_TESTER_HELPER_PASSWORD=ut3
  - UT3_TABLESPACE=users
+ - BUILD_DIR=${TRAVIS_BUILD_DIR}
+ - JOB_ID=${TRAVIS_JOB_ID}
+ - JOB_NUMBER=${TRAVIS_JOB_NUMBER}
+ - PULL_REQUEST_NAME=${TRAVIS_PULL_REQUEST}
+ - PULL_REQUEST_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH}
+ - TAG_NAME=${TRAVIS_TAG}
+ - REPO_SLUG=${TRAVIS_REPO_SLUG}
+ - PR_SLUG=${TRAVIS_PULL_REQUEST_SLUG}
+ - BRANCH_NAME=${TRAVIS_BRANCH}
  # Environment for building a release
  - CURRENT_BRANCH=${TRAVIS_BRANCH}
  - UTPLSQL_REPO="utPLSQL/utPLSQL"
@@ -36,24 +44,28 @@ env:
  - UTPLSQL_BUILD_USER_NAME="Travis CI"
  - CACHE_DIR=$HOME/.cache
  # Database Env
- - SQLCLI="$HOME/sqlcl/bin/sql"
- - OJDBC_HOME="$HOME/sqlcl/lib"
+ - SQLCLI="${BUILD_DIR}/sqlcl/bin/sql"
+ - OJDBC_HOME="${BUILD_DIR}/ojdbc"
  - ORACLE_PWD="oracle"
- - UT3_DOCKER_REPO="utplsqlv3/oracledb"
- - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
+ - DOCKHER_HUB_REPO="utplsqlv3/oracledb"
+ - DOCKER_VOLUME="/home/oracle/host"
+ - DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR"
  #utPLSQL released version directory
  - UTPLSQL_DIR="utPLSQL_latest_release"
  - SELFTESTING_BRANCH=${TRAVIS_BRANCH}
  - UTPLSQL_CLI_VERSION="3.1.8"
  # Maven
  - MAVEN_HOME=/usr/local/maven
  - MAVEN_CFG=$HOME/.m2
- matrix:
- - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g'
- - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' 
- - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
- - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
- - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
+ jobs:
+ - ORACLE_VERSION="11g-r2-xe" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_VOLUME="/mnt/host" DOCKER_OPTIONS='--shm-size=1g'
+# - ORACLE_VERSION="11-full" CONNECTION_STR='127.0.0.1:1521/XE' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle --shm-size=1g' DOCKER_VOLUME="/mnt/host"
+ - ORACLE_VERSION="12c-r1-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
+ - ORACLE_VERSION="12c-r2-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
+ - ORACLE_VERSION="18-slim" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle'
+ - ORACLE_VERSION="18c-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
+ - ORACLE_VERSION="19c-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB'
+ - ORACLE_VERSION="21-full" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle'
 
 cache:
  pip: true
@@ -64,6 +76,7 @@ cache:
  - $MAVEN_CFG
 
 before_install:
+
  #cache to be used between stages. Based on https://github.com/travis-ci/docs-travis-ci-com/issues/1329
  #delete all files in cache that are older than 5 days
  - mkdir -p $CACHE_DIR/stages_cache; find $CACHE_DIR/stages_cache/ -mtime +5 -exec rm {} \;
@@ -72,24 +85,29 @@ before_install:
  #Allow for sonar to blame issues
  - git fetch --unshallow
  # download latest utPLSQL release
- #- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
- - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-master} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
+ - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-main} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
  # download latest utPLSQL-cli release
  - curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/v${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip
 
 install:
- #- unzip utPLSQL.zip
  - unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
- - bash .travis/install_sqlcl.sh
+# - curl -Lk -o sqlcl-latest.zip https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-latest.zip
+# - unzip -q sqlcl-latest.zip -d $HOME
+ - mkdir -p ${OJDBC_HOME} #get JDBC driver and orai18n
+ - curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar https://download.oracle.com/otn-pub/otn_software/jdbc/213/ojdbc8.jar
+ - curl -Lk -o ${OJDBC_HOME}/orai18n.jar https://download.oracle.com/otn-pub/otn_software/jdbc/213/orai18n.jar
+ # Chmod is needed to allow for write access within from docker container volume
+ - chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source}
  - if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi
+ - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/.travis/install.sh; fi
+ - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/.travis/install_utplsql_release.sh; fi
 
 before_script:
- - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install.sh; fi
- - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install_utplsql_release.sh; fi
- - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_examples.sh; fi
+ - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/.travis/run_examples.sh; fi
+ - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/test/install_tests.sh; fi
 
 script:
- - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi
+ - if [[ ! $TRAVIS_TAG ]]; then bash test/run_tests.sh; fi
  - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi
  - if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "${TRAVIS_PULL_REQUEST}" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi
  - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi

.travis/coveralls_uploader.js

@@ -14,7 +14,7 @@ fs.readFile('../coverage.json',function (err,data) {
  return console.log(err);
  }
  req = JSON.parse(data);
- req.service_job_id = process.env.TRAVIS_JOB_ID;
+ req.service_job_id = process.env.JOB_ID;
  req.service_name = 'travis-ci';
  if (process.env.COVERALLS_REPO_TOKEN) {
  req.repo_token = process.env.COVERALLS_REPO_TOKEN;

.travis/install.sh

@@ -1,7 +1,13 @@
 #!/bin/bash
 
-cd source
 set -ev
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+cd ${SCRIPT_DIR}/../source
+
+INSTALL_FILE="install_headless_with_trigger.sql"
+if [[ ! -f "${INSTALL_FILE}" ]]; then
+ INSTALL_FILE="install_headless.sql"
+fi
 
 #install core of utplsql
 time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
@@ -11,33 +17,33 @@ set verify off
 
 --alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)';
 alter session set plsql_optimize_level=0;
-@install_headless_with_trigger.sql $UT3_OWNER $UT3_OWNER_PASSWORD
+@${INSTALL_FILE} $UT3_DEVELOP_SCHEMA $UT3_DEVELOP_SCHEMA_PASSWORD
 SQL
 
 #Run this step only on second child job (12.1 - at it's fastest)
-if [[ "${TRAVIS_JOB_NUMBER}" =~ \.2$ ]]; then
+if [[ "${JOB_NUMBER}" =~ \.2$ ]]; then
 
  #check code-style for errors
- time "$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR @../development/utplsql_style_check.sql
+ time "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR @../development/utplsql_style_check.sql
 
  #test install/uninstall process
  time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
  set feedback off
  set verify off
  whenever sqlerror exit failure rollback
 
- @uninstall_all.sql $UT3_OWNER
+ @uninstall_all.sql $UT3_DEVELOP_SCHEMA
  whenever sqlerror exit failure rollback
  declare
  v_leftover_objects_count integer;
  begin
  select sum(cnt)
  into v_leftover_objects_count
  from (
- select count(1) cnt from dba_objects where owner = '$UT3_OWNER'
+ select count(1) cnt from dba_objects where owner = '$UT3_DEVELOP_SCHEMA'
  where object_name not like 'PLSQL_PROFILER%' and object_name not like 'DBMSPCC_%'
  union all
- select count(1) cnt from dba_synonyms where table_owner = '$UT3_OWNER'
+ select count(1) cnt from dba_synonyms where table_owner = '$UT3_DEVELOP_SCHEMA'
  where table_name not like 'PLSQL_PROFILER%' and table_name not like 'DBMSPCC_%'
  );
  if v_leftover_objects_count > 0 then
@@ -52,9 +58,9 @@ SQL
  set verify off
 
  alter session set plsql_optimize_level=0;
- @install.sql $UT3_OWNER
- @install_ddl_trigger.sql $UT3_OWNER
- @create_synonyms_and_grants_for_public.sql $UT3_OWNER
+ @install.sql $UT3_DEVELOP_SCHEMA
+ @install_ddl_trigger.sql $UT3_DEVELOP_SCHEMA
+ @create_synonyms_and_grants_for_public.sql $UT3_DEVELOP_SCHEMA
 SQL
 
 fi
@@ -65,8 +71,8 @@ set feedback off
 whenever sqlerror exit failure rollback
 
 --------------------------------------------------------------------------------
-PROMPT Adding back create-trigger privilege to $UT3_OWNER for testing
-grant administer database trigger to $UT3_OWNER;
+PROMPT Adding back create-trigger privilege to $UT3_DEVELOP_SCHEMA for testing
+grant administer database trigger to $UT3_DEVELOP_SCHEMA;
 
 --------------------------------------------------------------------------------
 PROMPT Creating $UT3_TESTER - Power-user for testing internal framework code
@@ -76,27 +82,27 @@ grant create session, create procedure, create type, create table to $UT3_TESTER
 
 grant execute on dbms_lock to $UT3_TESTER;
 
-PROMPT Granting $UT3_OWNER code to $UT3_TESTER
+PROMPT Granting $UT3_DEVELOP_SCHEMA code to $UT3_TESTER
 
 begin
  for i in (
  select object_name from all_objects t
  where t.object_type in ('PACKAGE','TYPE')
- and owner = 'UT3'
+ and owner = '$UT3_DEVELOP_SCHEMA'
  and generated = 'N'
  and object_name not like 'SYS%')
  loop
- execute immediate 'grant execute on ut3."'||i.object_name||'" to UT3_TESTER';
+ execute immediate 'grant execute on $UT3_DEVELOP_SCHEMA."'||i.object_name||'" to $UT3_TESTER';
  end loop;
 end;
 /
 
-PROMPT Granting $UT3_OWNER tables to $UT3_TESTER
+PROMPT Granting $UT3_DEVELOP_SCHEMA tables to $UT3_TESTER
 
 begin
- for i in ( select table_name from all_tables t where owner = 'UT3' and nested = 'NO' and iot_name is null)
+ for i in ( select table_name from all_tables t where owner = '$UT3_DEVELOP_SCHEMA' and nested = 'NO' and iot_name is null)
  loop
- execute immediate 'grant select on UT3.'||i.table_name||' to UT3_TESTER';
+ execute immediate 'grant select on $UT3_DEVELOP_SCHEMA.'||i.table_name||' to $UT3_TESTER';
  end loop;
 end;
 /
@@ -108,6 +114,25 @@ PROMPT Creating $UT3_USER - minimal privileges user for API testing
 create user $UT3_USER identified by "$UT3_USER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE;
 grant create session, create procedure, create type, create table to $UT3_USER;
 
+PROMPT Grants for starting a debugging session from $UT3_USER
+grant debug connect session to $UT3_USER;
+grant debug any procedure to $UT3_USER;
+begin
+ \$if dbms_db_version.version <= 11 \$then
+ null; -- no addition action necessary
+ \$else
+ -- necessary on 12c or higher
+ dbms_network_acl_admin.append_host_ace (
+ host =>'*',
+ ace => sys.xs\$ace_type(
+ privilege_list => sys.xs\$name_list('JDWP') ,
+ principal_name => '$UT3_USER',
+ principal_type => sys.xs_acl.ptype_db
+ )
+ );
+ \$end
+end;
+/
 
 --------------------------------------------------------------------------------
 PROMPT Creating $UT3_TESTER_HELPER - provides functions to allow min grant test user setup tests.
@@ -119,11 +144,11 @@ PROMPT Grants for testing distributed transactions
 grant create public database link to $UT3_TESTER_HELPER;
 grant drop public database link to $UT3_TESTER_HELPER;
 
-PROMPT Grants for testing coverage outside of main UT3 schema.
+PROMPT Grants for testing coverage outside of main $UT3_DEVELOP_SCHEMA schema.
 grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type,
  select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table,
  select any dictionary, create any synonym, drop any synonym,
- grant any object privilege, grant any privilege
+ grant any object privilege, grant any privilege, create public synonym, drop public synonym, create any trigger
  to $UT3_TESTER_HELPER;
 
 grant create job to $UT3_TESTER_HELPER;

.travis/install_utplsql_release.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 set -ev
-
-cd $UTPLSQL_DIR/source
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+cd ${SCRIPT_DIR}/../${UTPLSQL_DIR}/source
 
 "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<SQL
 set serveroutput on
@@ -11,15 +11,15 @@ set trimspool on
 declare
  i integer := 0;
 begin
- dbms_output.put_line('Dropping synonyms pointing to schema '||upper('${UT3_OWNER}'));
+ dbms_output.put_line('Dropping synonyms pointing to schema '||upper('${UT3_DEVELOP_SCHEMA}'));
  for syn in (
  select
  case when owner = 'PUBLIC'
  then 'public synonym '
  else 'synonym ' || owner || '.' end || synonym_name as syn_name,
  table_owner||'.'||table_name as for_object
  from all_synonyms s
- where table_owner = upper('${UT3_OWNER}') and table_owner != owner
+ where table_owner = upper('${UT3_DEVELOP_SCHEMA}') and table_owner != owner
  )
  loop
  i := i + 1;
@@ -28,7 +28,7 @@ begin
  dbms_output.put_line('Dropped '||syn.syn_name||' for object '||syn.for_object);
  exception
  when others then
- dbms_output.put_line('FAILED to drop '||syn.syn_name||' for object '||syn.for_object);
+ dbms_output.put_line('FAILED to drop '||syn.syn_name||' for object '||syn.for_object||' with error '||sqlerrm);
  end;
  end loop;
  dbms_output.put_line(i||' synonyms dropped');
@@ -45,7 +45,7 @@ fi
 alter session set plsql_optimize_level=0;
 alter session set plsql_ccflags = 'SELF_TESTING_INSTALL:TRUE';
 
-@${INSTALL_FILE} ${UT3_RELEASE_VERSION_SCHEMA}
+@${INSTALL_FILE} ${UT3_RELEASE_VERSION_SCHEMA} ${UT3_RELEASE_VERSION_SCHEMA_PASSWORD}
 exit
 SQL