-fun adduser {user, passwd} =
- if Slave.shell [Config.Postgres.adduser, user] then
- NONE
- else
- SOME "Error executing CREATE USER script"
-
-fun createdb {user, dbname} =
- if Slave.shell [Config.Postgres.createdb, user, " ", dbname] then
- NONE
- else
- SOME "Error executing CREATE DATABASE script"
+fun adduser port {user, passwd} =
+ Option.map (fn s => "Error executing CREATE USER script:\n" ^ s)
+ (Slave.shellOutput [Config.Postgres.adduser, " ", port, " ", user])
+
+fun passwd _ = SOME "We don't use PostgreSQL passwords."
+
+fun createdb port {user, dbname, encoding} =
+ Option.map (fn s => "Error executing CREATE DATABASE script:\n" ^ s)
+ (Slave.shellOutput [Config.Postgres.createdb,
+ " ", port, " ", user, " ", dbname,
+ case encoding of NONE => "" | SOME e => " " ^ e])
+
+fun dropdb port {user, dbname} =
+ Option.map (fn s => "Error executing DROP DATABASE script:\n" ^ s)
+ (Slave.shellOutput [Config.Postgres.dropdb, " ", port, " ", user, " ", dbname])