From 3fd2e1c3c385b8a2a6ba61c2a4e83e53c6494d8c Mon Sep 17 00:00:00 2001
From: Jean-Marie Renouard <jmrenouard@gmail.com>
Date: Tue, 1 Oct 2019 01:41:52 +0200
Subject: [PATCH] Updates on tools for test suites

---
 build/bashrc                    | 21 +++++++++++++++++++++
 build/createMassDockerImages.sh |  7 +++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/build/bashrc b/build/bashrc
index 4bdb844..6fb426a 100644
--- a/build/bashrc
+++ b/build/bashrc
@@ -24,6 +24,27 @@ gen_mysqlalias()
     done < "$input"
 }
 
+exec_mysql()
+{
+    input="$1"
+    name=$2
+    db=$3
+    sqlfile=$4
+    while IFS='' read -r line
+    do
+        [ -z "$line" ] && continue
+        echo "$line" | grep -q $name
+        [ $? -ne 0 ] && continue
+        container_port=$(echo "$line" | cut -d\; -f1)
+        container_name=$(echo "$line" | cut -d\; -f2)
+        container_datadir=$(echo "$line" | cut -d\; -f3)
+        image_name=$(echo "$line" | cut -d\; -f4)
+
+
+        echo "* Executing $sqlfile on $container_name"
+        cat $sqlfile | mysql -u root -h 127.0.0.1 -P $container_port
+    done < "$input"
+}
 exec_mysqls()
 {
     input="$1"
diff --git a/build/createMassDockerImages.sh b/build/createMassDockerImages.sh
index ceac7df..9e5d419 100644
--- a/build/createMassDockerImages.sh
+++ b/build/createMassDockerImages.sh
@@ -47,12 +47,14 @@ do
     docker ps -a | grep -qE "$container_name^"
     docker rm -f $container_name
 
+    if [ 1 -eq 0 ]; then
     echo "* DELETING DATADIR: $container_datadir"
     sudo rm -rf $container_datadir
     [ "$1" = "clean" ] && continue
 
     echo "* CREATING DATADIR: $container_datadir"
-    sudo mkdir $container_datadir
+    sudo mkdir -p $container_datadir
+    fi
     #sudo chown -R mysql.mysql $container_datadir
     sudo chmod 777 $container_datadir
     echo "* STARTING CONTAINER: $container_name($container_port/TCP) BASED ON $image_name -> $container_datadir"
@@ -72,11 +74,8 @@ do
     ls -ls $container_datadir
     #break
     docker logs $container_name | grep -q "ready for connections"
-    alias mysql_$container_name="mysql -u root -P $container_port"
 done < "$input"
 
-[ "$1" = "clean" ] || docker system prune -a -f
-
 echo "* LISTING DOCKER IMAGES"
 docker images