structure MySQL :> MYSQL = struct
-fun adduser user =
- if Slave.shell [Config.MySQL.adduser, user] then
- NONE
- else
- SOME "Error executing CREATE USER script"
+val validPasswd = CharVector.all (fn ch => Char.isAlphaNum ch
+ orelse ch = #"!"
+ orelse ch = #"."
+ orelse ch = #"-"
+ orelse ch = #"_")
+
+fun adduser {user, passwd} =
+ case passwd of
+ NONE => SOME "No password given"
+ | SOME passwd =>
+ if validPasswd passwd then
+ 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 createdb {user, dbname} =
- if Slave.shell [Config.MySQL.createdb, user, " ", dbname] then
- NONE
+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])
else
- SOME "Error executing CREATE DATABASE script"
+ SOME "Password contains characters besides letters, digits, and !.-_"
+
+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} =
+ Option.map (fn s => "Error executing DROP DATABASE script:\n" ^ s)
+ (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])
-val _ = Dbms.register ("mysql", {adduser = adduser,
- createdb = createdb})
+val _ = Dbms.register ("mysql", {getpass = SOME Client.getpass,
+ adduser = adduser,
+ passwd = passwd,
+ createdb = createdb,
+ dropdb = dropdb,
+ grant = grant})
end