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

diff --git a/src/plugins/postgres.sml b/src/plugins/postgres.sml
index 09e3a07..607cf0d 100644
--- a/src/plugins/postgres.sml
+++ b/src/plugins/postgres.sml
@@ -20,31 +20,34 @@
 
 structure Postgres :> POSTGRES = struct
 
-fun adduser {user, passwd} =
-    if Slave.shell [Config.Postgres.adduser, user] then
-	NONE
-    else
-	SOME "Error executing CREATE USER 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 {user, dbname} =
-    if Slave.shell [Config.Postgres.createdb, user, " ", dbname] then
-	NONE
-    else
-	SOME "Error executing CREATE DATABASE script"
+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 {user, dbname} =
-    if Slave.shell [Config.Postgres.dropdb, user, " ", dbname] then
-	NONE
-    else
-	SOME "Error executing DROP DATABASE script"
+fun dropdb port {user, dbname} =
+    Option.map (fn s => "Error executing DROP DATABASE script:\n" ^ s)
+	       (Slave.shellOutput [Config.Postgres.dropdb, " ", port, " ", user, " ", dbname])
 
 val _ = Dbms.register ("postgres", {getpass = NONE,
-				    adduser = adduser,
+				    adduser = adduser Config.Postgres.postgres81port,
 				    passwd = passwd,
-				    createdb = createdb,
-				    dropdb = dropdb,
+				    createdb = createdb Config.Postgres.postgres81port,
+				    dropdb = dropdb Config.Postgres.postgres81port,
 				    grant = fn _ => SOME "You don't need to use GRANT for Postgres."})
 
+val _ = Dbms.register ("postgres-9.1", {getpass = NONE,
+					adduser = adduser Config.Postgres.postgres91port,
+					passwd = passwd,
+					createdb = createdb Config.Postgres.postgres91port,
+					dropdb = dropdb Config.Postgres.postgres91port,
+					grant = fn _ => SOME "You don't need to use GRANT for Postgres."})
+
 end