Specifying encoding on database creation

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

diff --git a/src/plugins/postgres.sml b/src/plugins/postgres.sml
index a267e4f..6465377 100644 (file)
--- a/src/plugins/postgres.sml
+++ b/src/plugins/postgres.sml
@@ -20,12 +20,27 @@
 
 structure Postgres :> POSTGRES = struct
 
 
 structure Postgres :> POSTGRES = struct
 

-fun adduser user =
-    if Slave.shell [Config.Postgres.adduser, user] then
-       NONE
-    else
-       SOME "Error executing CREATE USER script"
+fun adduser {user, passwd} =
+    Option.map (fn s => "Error executing CREATE USER script:\n" ^ s)
+              (Slave.shellOutput [Config.Postgres.adduser, user])

 
 

-val _ = Dbms.register ("postgres", {adduser = adduser})
+fun passwd _ = SOME "We don't use PostgreSQL passwords."
+
+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} =
+    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,
+                                   grant = fn _ => SOME "You don't need to use GRANT for Postgres."})

 
 end
 
 end