Changeset 40483 for branches/czw_branch/20170908/ippToPsps/test/mkgpc1.sh

Timestamp:

Jun 27, 2018, 3:31:55 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908

Files:

• . (modified) (1 prop)
• ippToPsps/test/mkgpc1.sh (modified) (5 diffs)

branches/czw_branch/20170908/ippToPsps/test/mkgpc1.sh

@@ -15 +15 @@
 endif
 
+if ("$1" == "user.sudo") then
+  if ($#argv != 4) goto usage;
+  set dbhost = $2
+  set dbuser = $3
+  set dbpass = $4
+
+  sudo mysql -h $dbhost -u root -p -e "grant all on *.* to $dbuser@"$dbhost" identified by '$dbpass'"
+  exit 0;
+endif
+
 if ("$1" == "create") then
   if ($#argv < 4) goto usage;
@@ -28 +38 @@
   # create a database with completely minimal tables needed to test
   mysql -h $dbhost -u $dbuser $dbpass -e "CREATE DATABASE $dbname"
+  if ($status) then
+    echo "ERROR: failed to create mysql database $dbname ($0)"
+    echo " NOTE: before running this test, you must have a mysql user:"
+    echo "       mkgpc1.sh user localhost dvo dvo (requires root password)"
+    exit 1
+  endif
   mysql -h $dbhost -u $dbuser $dbpass $dbname < gpc1schema.sql
   exit 0;
@@ -45 +61 @@
   (mysql -B -h $dbhost -u $dbuser $dbpass -e "show databases" | grep ^$dbname\$) >& /dev/null
   if ($status) then
-    echo "database $dbname does not yet exist"
+    echo "INFO: database $dbname does not yet exist ($0)"
     exit 0
   endif
 
-  # mysql -h $dbhost -u $dbuser $dbpass $dbname -e "show tables"
+  echo mysql -B -h $dbhost -u $dbuser $dbpass $dbname -e "show tables"
+  mysql -h $dbhost -u $dbuser $dbpass $dbname -e "show tables"
   mysql -h $dbhost -u $dbuser $dbpass $dbname -e "describe ippToPspsFake" >& /dev/null
   if ($status) then
@@ -91 +108 @@
   endif
 
+  echo mysql -B -h $dbhost -u $dbuser $dbpass $dbname -e "show tables"
   set ntable = `mysql -B -h $dbhost -u $dbuser $dbpass $dbname -e "show tables" | wc -l`
   echo ntable: $ntable
@@ -112 +130 @@
   echo "      delete an existing test db (enter pass 3x)"
   echo ""
+  echo "  mkgpc1.sh forcedelete (dbhost) (dbname) (dbuser) [dbpass]"
+  echo "      delete an existing test db (enter pass 3x), even if the number of tables is wrong"
+  echo ""
   echo "  mkgpc1.sh user (dbhost) (dbuser) (password)"
   echo "      create a new user and password for the test db"
   echo ""
+  echo "  mkgpc1.sh user.sudo (dbhost) (dbuser) (password)"
+  echo "      create a new user and password for the test db, using sudo mysql"
+  echo "      (this option is needed if your mysql installation uses the auth_socket plugin"
+  echo ""
   exit 2