postgres: rename dbms postgres-9.1 to postgres-9

This will actually be postgres 9.6 now, data is automatically being
migrated as there are no major incompatibilities (unlike 8.1 -> 9.1
which had a wire protocol break).

diff --git a/configDefault/postgres.cfg b/configDefault/postgres.cfg
index 4f0d3e0..58b4254 100644 (file)
--- a/configDefault/postgres.cfg
+++ b/configDefault/postgres.cfg
@@ -5,6 +5,6 @@ val createdb = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool
 val dropdb = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-postgres dropdb"
 
 val postgres81port = "5432";
 val dropdb = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-postgres dropdb"
 
 val postgres81port = "5432";

-val postgres91port = "5433"
+val postgres9port = "5433"

 
 end
 
 end

diff --git a/configDefault/postgres.csg b/configDefault/postgres.csg
index 12c752a..e6b7e1d 100644 (file)
--- a/configDefault/postgres.csg
+++ b/configDefault/postgres.csg
@@ -5,5 +5,5 @@ val createdb : string
 val dropdb : string
 
 val postgres81port : string
 val dropdb : string
 
 val postgres81port : string

-val postgres91port : string
+val postgres9port : string

 end
 end

diff --git a/src/plugins/postgres.sml b/src/plugins/postgres.sml
index 6bc3505..fda5801 100644 (file)
--- a/src/plugins/postgres.sml
+++ b/src/plugins/postgres.sml
@@ -37,18 +37,11 @@ fun dropdb port {user, dbname} =
     Option.map (fn s => "Error executing DROP DATABASE script:\n" ^ s)
               (Slave.shellOutput [Config.Postgres.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 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,
+val _ = Dbms.register ("postgres-9", {getpass = NONE,
+                                       adduser = adduser Config.Postgres.postgres9port,

                                        passwd = passwd,
                                        passwd = passwd,

-                                       createdb = createdb Config.Postgres.postgres91port,
-                                       dropdb = dropdb Config.Postgres.postgres91port,
+                                       createdb = createdb Config.Postgres.postgres9port,
+                                       dropdb = dropdb Config.Postgres.postgres9port,

                                        grant = fn _ => SOME "You don't need to use GRANT for Postgres."})
 
 end
                                        grant = fn _ => SOME "You don't need to use GRANT for Postgres."})
 
 end