X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/35659203a708078cdec25ff74adbe1e9168934d6..fe789bea628b15229156c8a4272c2b6063c9b1a0:/src/plugins/postgres.sml

diff --git a/src/plugins/postgres.sml b/src/plugins/postgres.sml
index b92a5cf..6465377 100644
--- a/src/plugins/postgres.sml
+++ b/src/plugins/postgres.sml
@@ -21,29 +21,26 @@
 structure Postgres :> POSTGRES = struct
 
 fun adduser {user, passwd} =
-    if Slave.shell [Config.Postgres.adduser, user] then
-	NONE
-    else
-	SOME "Error executing CREATE USER script"
+    Option.map (fn s => "Error executing CREATE USER script:\n" ^ s)
+	       (Slave.shellOutput [Config.Postgres.adduser, user])
 
 fun passwd _ = SOME "We don't use PostgreSQL passwords."
 
-fun createdb {user, dbname} =
-    if Slave.shell [Config.Postgres.createdb, user, " ", dbname] then
-	NONE
-    else
-	SOME "Error executing CREATE DATABASE script"
+fun createdb {user, dbname, encoding} =
+    Option.map (fn s => "Error executing CREATE DATABASE script:\n" ^ s)
+	       (Slave.shellOutput [Config.Postgres.createdb,
+				   " ", user, " ", dbname,
+				   case encoding of NONE => "" | SOME e => " " ^ e])
 
 fun dropdb {user, dbname} =
-    if Slave.shell [Config.Postgres.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.Postgres.dropdb, user, " ", dbname])
 
 val _ = Dbms.register ("postgres", {getpass = NONE,
 				    adduser = adduser,
 				    passwd = passwd,
 				    createdb = createdb,
-				    dropdb = dropdb})
+				    dropdb = dropdb,
+				    grant = fn _ => SOME "You don't need to use GRANT for Postgres."})
 
 end