X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/99cc41443c07f97535eaeecc628d99075ca2cebf..fe789bea628b15229156c8a4272c2b6063c9b1a0:/src/plugins/mysql.sml

diff --git a/src/plugins/mysql.sml b/src/plugins/mysql.sml
index 5114e17..a10fbbc 100644
--- a/src/plugins/mysql.sml
+++ b/src/plugins/mysql.sml
@@ -31,39 +31,32 @@ fun adduser {user, passwd} =
 	NONE => SOME "No password given"
       | SOME passwd =>
 	if validPasswd passwd then
-	    if Slave.shell [Config.MySQL.adduser, user, " ", passwd] then
-		NONE
-	    else
-		SOME "Error executing CREATE USER script"
+	    Option.map (fn s => "Error executing CREATE USER script:\n" ^ s)
+		       (Slave.shellOutput [Config.MySQL.adduser, user, " ", passwd])
 	else
 	    SOME "Password contains characters besides letters, digits, and !.-_"
 
 fun passwd {user, passwd} =
     if validPasswd passwd then
-	if Slave.shell [Config.MySQL.passwd, user, " ", passwd] then
-	    NONE
-	else
-	    SOME "Error executing SET PASSWORD script"
+	Option.map (fn s => "Error executing SET PASSWORD script:\n" ^ s)
+		   (Slave.shellOutput [Config.MySQL.passwd, user, " ", passwd])
     else
 	SOME "Password contains characters besides letters, digits, and !.-_"
 
-fun createdb {user, dbname} =
-    if Slave.shell [Config.MySQL.createdb, user, " ", dbname] then
-	NONE
-    else
-	SOME "Error executing CREATE DATABASE script"
+fun createdb {user, dbname, encoding} =
+    case encoding of
+	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])
 
 fun dropdb {user, dbname} =
-    if Slave.shell [Config.MySQL.dropdb, user, " ", dbname] then
-	NONE
-    else
-	SOME "Error executing DROP DATABASE script"
+    Option.map (fn s => "Error executing DROP DATABASE script:\n" ^ s)
+	       (Slave.shellOutput [Config.MySQL.dropdb, user, " ", dbname])
 
 fun grant {user, dbname} =
-    if Slave.shell [Config.MySQL.grant, user, " ", dbname] then
-	NONE
-    else
-	SOME "Error executing GRANT script"
+    Option.map (fn s => "Error executing GRANT script:\n" ^ s)
+	       (Slave.shellOutput [Config.MySQL.grant, user, " ", dbname])
 
 val _ = Dbms.register ("mysql", {getpass = SOME Client.getpass,
 				 adduser = adduser,