apache: fix missing newline in fastScriptAlias

[hcoop/domtool2.git] / src / plugins / postgres.sml

diff --git a/src/plugins/postgres.sml b/src/plugins/postgres.sml
index c2539eb..6bc3505 100644 (file)
--- a/src/plugins/postgres.sml
+++ b/src/plugins/postgres.sml
@@ -1,5 +1,6 @@
 (* HCoop Domtool (http://hcoop.sourceforge.net/)
  * Copyright (c) 2006, Adam Chlipala
+ * Copyright (c) 2012 Clinton Ebadi <clinton@unknownlamer.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,20 +21,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 createdb {user, dbname} =
-    if Slave.shell [Config.Postgres.createdb, user, " ", dbname] then
-       NONE
-    else
-       SOME "Error executing CREATE DATABASE script"
+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])
 
 val _ = Dbms.register ("postgres", {getpass = NONE,
-                                   adduser = adduser,
-                                   createdb = createdb})
+                                   adduser = adduser Config.Postgres.postgres81port,
+                                   passwd = passwd,
+                                   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