From 1407b6acbc4f3fa12b4a8dc77f8e1ef42a6f0463 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Fri, 9 Sep 2016 12:20:19 +0200
Subject: Added option to specify a db host in travis.sh

Signed-off-by: Haru <haru@dotalux.com>
---
 travis.sh | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/travis.sh b/travis.sh
index 10d263e49..db1ea5315 100755
--- a/travis.sh
+++ b/travis.sh
@@ -31,10 +31,10 @@ function foo {
 
 function usage {
 	echo "usage:"
-	echo "    $0 createdb <dbname> [dbuser] [dbpassword]"
-	echo "    $0 importdb <dbname> [dbuser] [dbpassword]"
+	echo "    $0 createdb <dbname> [dbuser] [dbpassword] [dbhost]"
+	echo "    $0 importdb <dbname> [dbuser] [dbpassword] [dbhost]"
 	echo "    $0 build [configure args]"
-	echo "    $0 test <dbname> [dbuser] [dbpassword]"
+	echo "    $0 test <dbname> [dbuser] [dbpassword] [dbhost]"
 	echo "    $0 getplugins"
 	exit 1
 }
@@ -62,21 +62,29 @@ function run_server {
 	fi
 }
 
+# Defaults
+DBNAME=ragnarok
+DBUSER=ragnarok
+DBPASS=ragnarok
+DBHOST=localhost
+
 case "$MODE" in
 	createdb|importdb|test)
-		DBNAME="$1"
-		DBUSER="$2"
-		DBPASS="$3"
-		if [ -z "$DBNAME" ]; then
+		if [ -z "$1" ]; then
 			usage
 		fi
-		if [ "$MODE" != "test" ]; then
-			if [ -n "$DBUSER" ]; then
-				DBUSER="-u $DBUSER"
-			fi
-			if [ -n "$DBPASS" ]; then
-				DBPASS="-p$DBPASS"
-			fi
+		DBNAME="$1"
+		if [ -n "$2" ]; then
+			DBUSER_ARG="-u $2"
+			DBUSER="$2"
+		fi
+		if [ -n "$3" ]; then
+			DBPASS_ARG="-p$3"
+			DBPASS="$3"
+		fi
+		if [ -n "$4" ]; then
+			DBHOST_ARG="-h $4"
+			DBHOST="$4"
 		fi
 		;;
 esac
@@ -84,12 +92,12 @@ esac
 case "$MODE" in
 	createdb)
 		echo "Creating database $DBNAME..."
-		mysql $DBUSER $DBPASS -e "create database $DBNAME;" || aborterror "Unable to create database."
+		mysql $DBUSER_ARG $DBPASS_ARG $DBHOST_ARG -e "create database $DBNAME;" || aborterror "Unable to create database."
 		;;
 	importdb)
 		echo "Importing tables into $DBNAME..."
-		mysql $DBUSER $DBPASS $DBNAME < sql-files/main.sql || aborterror "Unable to import main database."
-		mysql $DBUSER $DBPASS $DBNAME < sql-files/logs.sql || aborterror "Unable to import logs database."
+		mysql $DBUSER_ARG $DBPASS_ARG $DBHOST_ARG $DBNAME < sql-files/main.sql || aborterror "Unable to import main database."
+		mysql $DBUSER_ARG $DBPASS_ARG $DBHOST_ARG $DBNAME < sql-files/logs.sql || aborterror "Unable to import logs database."
 		;;
 	build)
 		(cd tools && ./validateinterfaces.py silent) || aborterror "Interface validation error."
@@ -103,7 +111,7 @@ case "$MODE" in
 sql_connection: {
 	//default_codepage: ""
 	//case_sensitive: false
-	db_hostname: "localhost"
+	db_hostname: "$DBHOST"
 	db_username: "$DBUSER"
 	db_password: "$DBPASS"
 	db_database: "$DBNAME"
-- 
cgit v1.2.3-70-g09d2