Fix build

viniciusam · viniciusam · commit 22dd71528e61 · 2017-05-18T14:39:31.000-03:00
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,9 @@ env:
     - DOCKER_CFG=$HOME/.docker
     - DOCKER_REPO="viniciusam/oracledb"
     - MAVEN_HOME=/usr/local/maven
-    - DB_USER=app
-    - DB_PASS=app
+    - API_DB_URL="127.0.0.1:1521:XE"
+    - API_DB_USER=api
+    - API_DB_PASS=api
   matrix:
     - ORACLE_VERSION="11g-xe-r2" CONNECTION_STR="127.0.0.1:1521/XE" DOCKER_OPTIONS="--shm-size=1g"
 
diff --git a/.travis/create_api_user.sh b/.travis/create_api_user.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ev
 
-sqlplus -S -L sys/oracle@//$CONNECTION_STR AS SYSDBA <<EOF
+sqlplus -S -L / AS SYSDBA <<EOF
 create user $DB_USER identified by $DB_PASS
 quota unlimited on USERS
 default tablespace USERS;
diff --git a/.travis/install_utplsql.sh b/.travis/install_utplsql.sh
@@ -23,10 +23,11 @@ EOF
 # docker cp ./$UTPLSQL_FILE.tar.gz $ORACLE_VERSION:/$UTPLSQL_FILE.tar.gz
 docker cp ./$UTPLSQL_FILE $ORACLE_VERSION:/$UTPLSQL_FILE
 docker cp ./install.sh.tmp $ORACLE_VERSION:/install.sh
+docker cp ./create_api_user.sh $ORACLE_VERSION:/create_api_user.sh
 
 # Remove temporary files.
 # rm $UTPLSQL_FILE.tar.gz
 rm install.sh.tmp
 
 # Execute the utPLSQL installation inside the container.
-docker exec $ORACLE_VERSION bash install.sh
+docker exec $ORACLE_VERSION bash -c "install.sh && create_api_user.sh"
diff --git a/src/test/java/io/github/utplsql/api/rules/DatabaseRule.java b/src/test/java/io/github/utplsql/api/rules/DatabaseRule.java
@@ -18,9 +18,9 @@ public class DatabaseRule extends ExternalResource {
     private static String sPass;
 
     static {
-        sUrl  = System.getenv("DB_URL")  != null ? System.getenv("DB_URL")  : "127.0.0.1:1521:XE";
-        sUser = System.getenv("DB_USER") != null ? System.getenv("DB_USER") : "app";
-        sPass = System.getenv("DB_PASS") != null ? System.getenv("DB_PASS") : "app";
+        sUrl  = System.getenv("API_DB_URL")  != null ? System.getenv("API_DB_URL")  : "127.0.0.1:1521:XE";
+        sUser = System.getenv("API_DB_USER") != null ? System.getenv("API_DB_USER") : "app";
+        sPass = System.getenv("API_DB_PASS") != null ? System.getenv("API_DB_PASS") : "app";
     }
 
     private List<Connection> connectionList;
