Merge pull request utPLSQL#473 from utPLSQL/release/v3.0.3

Release/v3.0.3

Author: jgebal

.gitignore

@@ -4,10 +4,14 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 # User-specific stuff:
 .idea/
+.vscode/
 .sonar/
 site/
 pages/
 release/
 *.gz
 *.zip
 node_modules/
+utPLSQL_latest_release/
+utPLSQL-cli/
+development/env.sh

.travis.yml

@@ -23,14 +23,17 @@ env:
  global:
  - UT3_OWNER=ut3
  - UT3_OWNER_PASSWORD=ut3
+ - UT3_RELEASE_VERSION_SCHEMA=UT3_LATEST_RELEASE
  - UT3_USER="UT3\$USER#"
  - UT3_USER_PASSWORD=ut3
+ - UT3_TESTER=ut3_tester
+ - UT3_TESTER_PASSWORD=ut3
  - UT3_TABLESPACE=users
  # Environment for building a release
  - CURRENT_BRANCH=${TRAVIS_BRANCH}
  - UTPLSQL_REPO="utPLSQL/utPLSQL"
  - UTPLSQL_BUILD_NO="${TRAVIS_BUILD_NUMBER:-0}"
- - UTPLSQL_VERSION_PLACEHOLDER='utPLSQL - Version'
+ - UTPLSQL_VERSION_PATTERN='v?([0-9X]+\.){3}[0-9X]+'
  - UTPLSQL_VERSION=$(. .travis/get_project_version.sh)
  - UTPLSQL_BUILD_VERSION=$(. .travis/get_project_build_version.sh)
  - UTPLSQL_SOURCES_DIR='source'
@@ -39,18 +42,38 @@ env:
  # Database Env
  - SQLCLI="$HOME/sqlcl/bin/sql"
  - ORACLE_PWD="oracle"
+ - UT3_DOCKER_REPO="utplsqlv3/oracledb"
+ - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
+ #utPLSQL released version directory
+ - UTPLSQL_DIR="utPLSQL_latest_release"
+ - UTPLSQL_CLI_FILE="utPLSQL-cli-develop-test3.zip"
  matrix:
- - ORACLE_VERSION="11g-xe-r2"  CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g'
- - ORACLE_VERSION="12c-se2-r1-v2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
- - ORACLE_VERSION="12c-se-r2-v4" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
+ - 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}" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
+ - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2}" 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
 
+before_install:
+ #The update_project_version is done before deployment to validate that the change of project files does not break installation
+ - bash .travis/update_project_version.sh
+ - git config --global user.email "builds@travis-ci.com"
+ - git config --global user.name "${UTPLSQL_BUILD_USER_NAME}"
+ - git remote rm origin
+ - git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO}
+ # 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
+ # download utPLSQL-cli develop
+ - curl -Lk -o utPLSQL-cli.zip https://bintray.com/viniciusam/utPLSQL-cli/download_file?file_path=${UTPLSQL_CLI_FILE}
+
 install:
+ #- unzip utPLSQL.zip
+ - unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
  - pip install mkdocs
  - bash .travis/install_sqlcl.sh
  - sudo mkdir -p /dev/pdbs
@@ -59,17 +82,15 @@ install:
  - df -h
 
 before_script:
- #The update_project_version is done before deployment to validate that the change of project files does not break installation
- - bash .travis/update_project_version.sh
- - git config --global user.email "builds@travis-ci.com"
- - git config --global user.name "${UTPLSQL_BUILD_USER_NAME}"
- - git remote rm origin
- - git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO}
+ - 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/create_additional_grants_for_old_tests.sh; fi
+ - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_examples.sh; fi
+ - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_old_tests.sh; fi
 
 script:
- - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install.sh; fi
- - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_examples_and_tests.sh; fi
- - if [ "${TRAVIS_TAG}" = "" ] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ]; then sonar-scanner; fi
+ - if [ "${TRAVIS_TAG}" = "" ]; then bash test/install_and_run_tests.sh; fi
+ - if [ "${TRAVIS_TAG}" = "" ] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then sonar-scanner; fi
  - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/coveralls_uploader.sh; fi
  - bash .travis/build_docs.sh
  - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/push_release_version.sh; fi

.travis/coveralls_uploader.js

@@ -9,7 +9,7 @@ if (process.env.COVERALLS_URL_BASE) {
 url = 'https://coveralls.io/api/v1/jobs';
 }
 
-fs.readFile('../tests/coverage.json',function (err,data) { 
+fs.readFile('../old_tests/coverage.json',function (err,data) {
 if (err) {
 return console.log(err);
 }
@@ -19,13 +19,13 @@ fs.readFile('../tests/coverage.json',function (err,data) {
 if (process.env.COVERALLS_REPO_TOKEN) {
 req.repo_token = process.env.COVERALLS_REPO_TOKEN;
 }
-
+
 for (var i in req.source_files) {
 req.source_files[i].source_digest = md5File.sync("../" + req.source_files[i].name);
 }
 
 var requestStr = JSON.stringify(req);
-
+
 request.post({url : url, form : { json:requestStr}}, function(err, response, body){process.stdout.write(body);});
 
-});
+});

.travis/create_additional_grants_for_old_tests.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+cd source
+set -ev
+
+#additional privileges to run scripted tests
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+set feedback on
+--needed for Mystats script to work
+grant select any dictionary to $UT3_OWNER;
+--Needed for testing a coverage outside ut3_owner.
+grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER;
+
+exit
+SQL
+
+#Create additional users
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+set feedback off
+@create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE
+
+exit
+SQL

.travis/install.sh

@@ -1,41 +1,35 @@
 #!/bin/bash
 
-cd "$(dirname "$(readlink -f "$0")")"
+cd source
 set -ev
 #install core of utplsql
 "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
-pwd
 set feedback off
 set verify off
 
-@../source/install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD
+@install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD
 SQL
 
+#additional privileges to run scripted tests
 "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
 set feedback on
 --needed for Mystats script to work
 grant select any dictionary to $UT3_OWNER;
 --Needed for testing a coverage outside ut3_owner.
 grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER;
 
-set feedback off
-@../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
 conn $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR
-@utplsql_style_check.sql
+@../development/utplsql_style_check.sql
+exit
+SQL
 
+#Create additional users
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+set feedback off
+@create_utplsql_owner.sql $UT3_TESTER $UT3_TESTER_PASSWORD $UT3_TABLESPACE
+
+set feedback on
+--Needed for testing coverage outside of main UT3 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 to $UT3_TESTER;
 exit
 SQL

.travis/install_utplsql_release.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -ev
+
+cd $UTPLSQL_DIR/source
+
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<SQL
+set serveroutput on
+set linesize 200
+set trimspool on
+declare
+ i integer := 0;
+begin
+ dbms_output.put_line('Dropping synonyms pointing to schema '||upper('${UT3_OWNER}'));
+ 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
+ )
+ loop
+ i := i + 1;
+ begin
+ execute immediate 'drop '||syn.syn_name;
+ 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);
+ end;
+ end loop;
+ dbms_output.put_line(i||' synonyms dropped');
+end;
+/
+SQL
+
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA @install_headless.sql ${UT3_RELEASE_VERSION_SCHEMA}
+
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<SQL
+grant select any dictionary to ${UT3_RELEASE_VERSION_SCHEMA};
+exit
+SQL

.travis/run_examples_and_tests.sh renamed to .travis/run_examples.sh

@@ -9,15 +9,6 @@ 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
+SQL

.travis/run_old_tests.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ev
+
+cd old_tests
+
+"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR <<SQL
+@RunAll.sql
+exit
+SQL

.travis/start_db.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 set -e
 
-DOCKER_BASE_TAG="viniciusam/oracledb"
-
 # Private Repo Login
 if [ ! -f $CACHE_DIR/.docker/config.json ]; then
  docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
@@ -12,6 +10,6 @@ else
  mkdir -p $HOME/.docker && cp $CACHE_DIR/.docker/config.json $HOME/.docker/
 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 pull $DOCKHER_HUB_REPO:$ORACLE_VERSION
+docker run -d --name $ORACLE_VERSION $DOCKER_OPTIONS -p 1521:1521 $DOCKHER_HUB_REPO:$ORACLE_VERSION
 docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered

.travis/update_project_version.sh

@@ -3,7 +3,7 @@
 echo Current branch is "${CURRENT_BRANCH}"
 
 echo Update version in project source files
-find ${UTPLSQL_SOURCES_DIR} -type f -name '*' -exec sed -i -r "s/(${UTPLSQL_VERSION_PLACEHOLDER} )[^']*(')?/\1${UTPLSQL_BUILD_VERSION}\2/" {} \;
+find ${UTPLSQL_SOURCES_DIR} -type f -name '*' -exec sed -i -r "s/${UTPLSQL_VERSION_PATTERN}/${UTPLSQL_BUILD_VERSION}/" {} \;
 echo Source files updated with version tag: ${UTPLSQL_BUILD_VERSION}
 
 echo Update of sonar-project.properties sonar.projectVersion