From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Mon, 10 Dec 2012 01:42:18 +0000 (-0500)
Subject: Remove spaces from dbtool mysql driver config
X-Git-Tag: release_20121209~1
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/0ef723ce97749ca6a6764afd39ba05ca81fb1bc2?ds=inline

Remove spaces from dbtool mysql driver config
This was used to avoid an extra " " in the shell command in SML. I
think that's just asking for subtle bugs.
---

diff --git a/configDefault/mysql.cfg b/configDefault/mysql.cfg
index 310d7fa..05faa7a 100644
--- a/configDefault/mysql.cfg
+++ b/configDefault/mysql.cfg
@@ -1,9 +1,9 @@
 structure MySQL :> MYSQL_CONFIG = struct
 
-val adduser = "/usr/bin/sudo /usr/local/sbin/domtool-mysql adduser "
-val passwd = "/usr/bin/sudo /usr/local/sbin/domtool-mysql passwd "
-val createdb = "/usr/bin/sudo /usr/local/sbin/domtool-mysql createdb "
-val dropdb = "/usr/bin/sudo /usr/local/sbin/domtool-mysql dropdb "
-val grant = "/usr/bin/sudo /usr/local/sbin/domtool-mysql grant "
+val adduser = "/usr/bin/sudo /usr/local/sbin/domtool-mysql adduser"
+val passwd = "/usr/bin/sudo /usr/local/sbin/domtool-mysql passwd"
+val createdb = "/usr/bin/sudo /usr/local/sbin/domtool-mysql createdb"
+val dropdb = "/usr/bin/sudo /usr/local/sbin/domtool-mysql dropdb"
+val grant = "/usr/bin/sudo /usr/local/sbin/domtool-mysql grant"
 
 end
diff --git a/src/plugins/mysql.sml b/src/plugins/mysql.sml
index a10fbbc..1b4d07a 100644
--- a/src/plugins/mysql.sml
+++ b/src/plugins/mysql.sml
@@ -32,14 +32,14 @@ fun adduser {user, passwd} =
       | SOME passwd =>
 	if validPasswd passwd then
 	    Option.map (fn s => "Error executing CREATE USER script:\n" ^ s)
-		       (Slave.shellOutput [Config.MySQL.adduser, user, " ", passwd])
+		       (Slave.shellOutput [Config.MySQL.adduser, " ", user, " ", passwd])
 	else
 	    SOME "Password contains characters besides letters, digits, and !.-_"
 
 fun passwd {user, passwd} =
     if validPasswd passwd then
 	Option.map (fn s => "Error executing SET PASSWORD script:\n" ^ s)
-		   (Slave.shellOutput [Config.MySQL.passwd, user, " ", passwd])
+		   (Slave.shellOutput [Config.MySQL.passwd, " ", user, " ", passwd])
     else
 	SOME "Password contains characters besides letters, digits, and !.-_"
 
@@ -48,15 +48,15 @@ fun createdb {user, dbname, encoding} =
 	SOME _ => SOME "MySQL doesn't support specifying encodings"
       | NONE =>
 	Option.map (fn s => "Error executing CREATE DATABASE script:\n" ^ s)
-		   (Slave.shellOutput [Config.MySQL.createdb, user, " ", dbname])
+		   (Slave.shellOutput [Config.MySQL.createdb, " ", user, " ", dbname])
 
 fun dropdb {user, dbname} =
     Option.map (fn s => "Error executing DROP DATABASE script:\n" ^ s)
-	       (Slave.shellOutput [Config.MySQL.dropdb, user, " ", dbname])
+	       (Slave.shellOutput [Config.MySQL.dropdb, " ", user, " ", dbname])
 
 fun grant {user, dbname} =
     Option.map (fn s => "Error executing GRANT script:\n" ^ s)
-	       (Slave.shellOutput [Config.MySQL.grant, user, " ", dbname])
+	       (Slave.shellOutput [Config.MySQL.grant, " ", user, " ", dbname])
 
 val _ = Dbms.register ("mysql", {getpass = SOME Client.getpass,
 				 adduser = adduser,