Merge pull request #3 from panubo/fix/references-grant

Fix/references grant

Author: macropin

commands/create-user-db

@@ -34,7 +34,7 @@ if [ "$CREATE_DB" == 'true' ]; then
     echo "CREATE DATABASE IF NOT EXISTS ${NEW_NAME};" | $MYSQL
 fi
 # Specifiy the exact permissions. NB. This is also RDS compatible as GRANT ALL not possible.
-echo "GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON ${NEW_NAME}.* TO ${NEW_NAME}@'%' IDENTIFIED BY '$NEW_PASS';" | $MYSQL
+echo "GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON ${NEW_NAME}.* TO ${NEW_NAME}@'%' IDENTIFIED BY '$NEW_PASS';" | $MYSQL
 
 [ "$ECHO_PASSWORD" == 'false' ] && NEW_PASS='********'
 echo "Created: ${NEW_NAME} / ${NEW_PASS}"

tests/config.sh

@@ -2,3 +2,5 @@ TEST_NAME='mariadb-toolbox'
 TEST_IMAGE="panubo/$TEST_NAME"
 TEST_TAG='test'
 TEST_CONTAINER="${TEST_IMAGE}:${TEST_TAG}"
+MARIADB_IMAGE='mariadb'
+MARIADB_TAG='latest'

tests/test.sh

@@ -9,22 +9,22 @@ CWD="$(dirname $0)/"
 . ${CWD}functions.sh
 
 echo "=> Test backup command"
-docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
+docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
 docker run -t -i --name $TEST_NAME --link mariadb -e BACKUP_DIR=/backup $TEST_CONTAINER backup
 cleanup mariadb $TEST_NAME
 
 echo "=> Test check command"
-docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
+docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
 docker run -t -i --name $TEST_NAME --link mariadb $TEST_CONTAINER check
 cleanup mariadb $TEST_NAME
 
 echo "=> Test copy-database command"
-docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
+docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
 docker run -t -i --name $TEST_NAME --link mariadb -e BACKUP_DIR=/backup -v /tmp/data:/data $TEST_CONTAINER copy-database mysql mysql-backup
 cleanup mariadb $TEST_NAME
 
 echo "=> Test convert-to-innodb command"
-docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
+docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
 (
 echo "CREATE DATABASE foodb;"
 echo "USE foodb; CREATE TABLE testtable (a INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (a)) ENGINE=MyISAM;"
@@ -33,7 +33,7 @@ docker run -t -i --name $TEST_NAME --link mariadb -e BACKUP_DIR=/backup $TEST_CO
 cleanup mariadb $TEST_NAME
 
 echo "=> Test create-user-db command"
-docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
+docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
 docker run -t -i --name $TEST_NAME --link mariadb -e BACKUP_DIR=/backup $TEST_CONTAINER create-user-db foo foopass
 cleanup mariadb $TEST_NAME
 
@@ -42,15 +42,15 @@ mkdir -p /tmp/data
 (
 echo "CREATE TABLE testtable (a INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (a)) ENGINE=MyISAM;"
 ) | gzip > /tmp/data/foodb.sql.gz
-docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
+docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
 docker run -t -i --name $TEST_NAME --link mariadb -e DATA_SRC=/data -v /tmp/data:/data $TEST_CONTAINER import
 cleanup mariadb $TEST_NAME
 
 echo "=> Test load command"
 echo "TODO"
 
 echo "=> Test mysql command"
-docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
+docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
 echo "SHOW DATABASES;" | docker run -i --name $TEST_NAME --link mariadb $TEST_CONTAINER mysql
 cleanup mariadb $TEST_NAME