Specify host for database connections

[hcoop/portal.git] / init.sml

diff --git a/init.sml b/init.sml
index e01df22..ba3b2bf 100644 (file)
--- a/init.sml
+++ b/init.sml
@@ -131,8 +131,8 @@ fun addUser (name, rname, bal, app, shares) =
        C.dml db ($`INSERT INTO WebUser (id, name, rname, bal, joined, app, shares, paypal, checkout)
                    VALUES (^(C.intToSql id), ^(C.stringToSql name), ^(C.stringToSql rname), ^(C.intToSql bal),
                            CURRENT_TIMESTAMP, ^(C.intToSql app), ^(C.intToSql shares),
-                           (SELECT paypal FROM MemberApp WHERE app = ^(C.intToSql app)),
-                           (SELECT checkout FROM MemberApp WHERE app = ^(C.intToSql app)))`);
+                           (SELECT paypal FROM MemberApp WHERE id = ^(C.intToSql app)),
+                           (SELECT checkout FROM MemberApp WHERE id = ^(C.intToSql app)))`);
        id
     end
 
@@ -151,7 +151,7 @@ fun modUser (user : user) =
 
 fun byPledge () =
     C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app, shares, paypal, checkout
-                                 FROM WebUser
+                                 FROM WebUserPaying
                                  WHERE shares > 1
                                  ORDER BY shares DESC, name`)
 
@@ -159,7 +159,7 @@ fun deleteUser id =
     C.dml (getDb ()) ($`DELETE FROM WebUser WHERE id = ^(C.intToSql id)`)
 
 fun validUsername name =
-    size name <= 10
+    size name <= 12
     andalso size name > 0
     andalso Char.isLower (String.sub (name, 0))
     andalso CharVector.all Char.isAlphaNum name