Merge branch 'develop' into feature/pure_sql

jgebal · web-flow · commit b823922a4ec0 · 2019-03-08T11:58:58.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -38,6 +38,7 @@ env:
     - CACHE_DIR=$HOME/.cache
     # Database Env
     - SQLCLI="$HOME/sqlcl/bin/sql"
+    - OJDBC_HOME="$HOME/sqlcl/lib"
     - ORACLE_PWD="oracle"
     - UT3_DOCKER_REPO="utplsqlv3/oracledb"
     - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
@@ -94,7 +95,7 @@ before_script:
 script:
   - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_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_SLUG}" = "${TRAVIS_REPO_SLUG}" ]; then bash .travis/run_sonar_scanner.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
 
 notifications:
diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh
@@ -12,6 +12,9 @@ PR_KEY_PROPERTY="sonar.pullrequest.key"
 PR_SONAR_BASE_PROPERTY="sonar.pullrequest.base"
 PR_SONAR_TOKEN_PROPERTY="sonar.pullrequest.github.token.secured"
 
+DB_URL_SONAR_PROPERTY="sonar.plsql.jdbc.url"
+DB_DRIVER_PATH="sonar.plsql.jdbc.driver.path"
+
 #Add property to file
 function add_sonar_property {
     echo "$1=$2" >> sonar-project.properties
@@ -52,6 +55,14 @@ else
     echo "No need to update sonar we building on release or develop"
 fi
 
+#Address issue : Could not find ref 'develop' in refs/heads or refs/remotes/origin
+git fetch --no-tags https://github.com/utPLSQL/utPLSQL.git +refs/heads/develop:refs/remotes/origin/develop
+
+echo "Adding OJDBC Driver Path ${OJDBC_HOME}/ojdbc8.jar"
+add_sonar_property "${DB_URL_SONAR_PROPERTY}" "jdbc:oracle:thin:@${CONNECTION_STR}"
+add_sonar_property "${DB_DRIVER_PATH}" "${OJDBC_HOME}/ojdbc8.jar"
+
+
 #Execute Sonar scanner
 echo "Executing sonar scanner"
 sonar-scanner
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -19,9 +19,19 @@ sonar.projectDescription=PL/SQL Unit Testing Framework
 sonar.plsql.file.suffixes=sql,tab,pkb,tpb
 sonar.language=plsql
 
+sonar.exclusions=create_synonyms_and_grants_for_public.sql, create_user_grants.sql, create_user_synonyms.sql, create_utplsql_owner.sql, define_ut3_owner_param.sql, install.sql, install_above_12_1.sql, install_component.sql, install_headless.sql, uninstall.sql, uninstall_all.sql, uninstall_coverage_tables.sql
+
+
 sonar.pullrequest.provider=github
 sonar.pullrequest.github.endpoint=https://api.github.com/
 sonar.pullrequest.github.repository=utPLSQL/utPLSQL
 
+sonar.plsql.jdbc.driver.class=oracle.jdbc.OracleDriver
+sonar.plsql.jdbc.user=UT3
+sonar.plsql.jdbc.password=ut3
+sonar.plsql.defaultSchema=UT3
+
+
+
 # Encoding of the source code. Default is default system encoding
 #sonar.sourceEncoding=UTF-8
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is
    *
    */
 
-  gc_version                 constant varchar2(50) := 'v3.1.4.2590-develop';
+  gc_version                 constant varchar2(50) := 'v3.1.4.2619-develop';
 
   subtype t_executable_type      is varchar2(30);
   gc_before_all                  constant t_executable_type := 'beforeall';

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is`
`21`	`21`	`*`
`22`	`22`	`*/`
`23`	`23`
`24`		`- gc_version constant varchar2(50) := 'v3.1.4.2590-develop';`
	`24`	`+ gc_version constant varchar2(50) := 'v3.1.4.2619-develop';`
`25`	`25`
`26`	`26`	`subtype t_executable_type is varchar2(30);`
`27`	`27`	`gc_before_all constant t_executable_type := 'beforeall';`