Specifying encoding on database creation

[hcoop/domtool2.git] / src / main-dbtool.sml

diff --git a/src/main-dbtool.sml b/src/main-dbtool.sml
index d9765a9..d45d15e 100644 (file)
--- a/src/main-dbtool.sml
+++ b/src/main-dbtool.sml
@@ -58,9 +58,16 @@ val _ =
                end
              | ["createdb", dbname] =>
                if Dbms.validDbname dbname then
                end
              | ["createdb", dbname] =>
                if Dbms.validDbname dbname then

-                   Main.requestDbTable {dbtype = dbtype, dbname = dbname}
+                   Main.requestDbTable {dbtype = dbtype, dbname = dbname, encoding = NONE}

                else
                    print ("Invalid database name " ^ dbname ^ ".\n")
                else
                    print ("Invalid database name " ^ dbname ^ ".\n")

+             | ["createdb", dbname, encoding] =>
+               if not (Dbms.validDbname dbname) then
+                   print ("Invalid database name " ^ dbname ^ ".\n")
+               else if not (Dbms.validEncoding (SOME encoding)) then
+                   print ("Invalid encoding name " ^ encoding ^ ".\n")
+               else
+                   Main.requestDbTable {dbtype = dbtype, dbname = dbname, encoding = SOME encoding}

              | ["dropdb", dbname] =>
                if Dbms.validDbname dbname then
                    Main.requestDbDrop {dbtype = dbtype, dbname = dbname}
              | ["dropdb", dbname] =>
                if Dbms.validDbname dbname then
                    Main.requestDbDrop {dbtype = dbtype, dbname = dbname}