Changeset 34936 for branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/test/dbadmin.sh

Timestamp:

Jan 15, 2013, 8:37:38 PM (14 years ago)

Author:

eugene

Message:

fix mysql issues with multirow inserts; update tests

File:

• branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/test/dbadmin.sh (modified) (3 diffs)

branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/test/dbadmin.sh

@@ -18 +18 @@
 
 if ("$1" == "create") then
-  if ($#argv != 4) goto usage;
+  if ($#argv < 4) goto usage;
   set dbhost = $2
   set dbname = $3
   set dbuser = $4
+  if ($#argv == 5) then
+    set dbpass = "-p$5"
+  else 
+    set dbpass = "-p"
+  endif
 
-  mysql -h $dbhost -u $dbuser -p <<EOF
+  mysql -h $dbhost -u $dbuser $dbpass <<EOF
    CREATE DATABASE $dbname;
    USE $dbname;
@@ -48 +53 @@
 
 if ("$1" == "delete") then
-  if ($#argv != 4) goto usage;
+  if ($#argv < 4) goto usage;
   set dbhost = $2
   set dbname = $3
   set dbuser = $4
+  if ($#argv == 5) then
+    set dbpass = "-p$5"
+  else 
+    set dbpass = "-p"
+  endif
 
-  mysql -h $dbhost -u $dbuser -p <<EOF > /dev/null
+  echo mysql -h $dbhost -u $dbuser $dbpass
+
+  mysql -h $dbhost -u $dbuser $dbpass <<EOF > /dev/null
    USE $dbname;
    describe dvoDetection;
@@ -64 +76 @@
 
   echo "database is valid, deleting"
-  mysql -h $dbhost -u $dbuser -p <<EOF
+  mysql -h $dbhost -u $dbuser $dbpass <<EOF
    drop database $dbname;
 EOF