From: adamch <adamch>
Date: Sat, 18 Jun 2005 21:13:35 +0000 (+0000)
Subject: Update several modules to deal with new WebUser column 'app'
X-Git-Url: https://git.hcoop.net/hcoop/zz_old/portal.git/commitdiff_plain/ca98811078e9864cd7f003ca2e85843b6e0d0729

Update several modules to deal with new WebUser column 'app'
---

diff --git a/balance.sml b/balance.sml
index 7b25933..4e56812 100644
--- a/balance.sml
+++ b/balance.sml
@@ -57,7 +57,7 @@ fun balanceNameToId name =
       | _ => NONE
 
 fun listBalanceUsers bal =
-    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined
+    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app
 			          FROM WebUser
 				  WHERE bal = ^(C.intToSql bal)
 			          ORDER BY name`)
diff --git a/group.sml b/group.sml
index cc3d5ea..e04a0b4 100644
--- a/group.sml
+++ b/group.sml
@@ -107,7 +107,7 @@ fun mkMembershipRow [grp, usr] =
   | mkMembershipRow row = Init.rowError ("membership", row)
 
 fun groupMembers grp =
-    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined FROM Membership, WebUser
+    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app FROM Membership, WebUser
 					WHERE grp = ^(C.intToSql grp)
 					   AND usr = id
 					ORDER BY name`)
diff --git a/location.sml b/location.sml
index fd73de8..ca66ee2 100644
--- a/location.sml
+++ b/location.sml
@@ -135,7 +135,7 @@ fun recordResidents () =
 		addToParents (loc, count)
 	    end
     in
-	C.fold db folder NM.empty ($`SELECT loc, id, name, rname, bal, joined
+	C.fold db folder NM.empty ($`SELECT loc, id, name, rname, bal, joined, app
 				     FROM Lives JOIN WebUser ON usr = id`)
     end
 
@@ -293,7 +293,7 @@ fun removeFromLocation (lives : lives) =
     end
 
 fun residentsOneLevel loc =
-    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined FROM Lives, WebUser
+    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app FROM Lives, WebUser
 					WHERE loc = ^(C.intToSql loc)
 					   AND usr = id
 					ORDER BY name`)
diff --git a/money.sml b/money.sml
index 4a4adb7..4ff587a 100644
--- a/money.sml
+++ b/money.sml
@@ -86,7 +86,7 @@ val mkUserRow' =
      | row => Init.rowError ("listUsers", row)
 
 fun listUsers trn =
-    C.map (getDb ()) mkUserRow' ($`SELECT trn, id, name, rname, bal, joined
+    C.map (getDb ()) mkUserRow' ($`SELECT trn, id, name, rname, bal, joined, app
 			           FROM WebUser LEFT OUTER JOIN Charge ON usr = id AND trn = ^(C.intToSql trn)
 			           ORDER BY name`)
 
@@ -112,7 +112,7 @@ val mkChargeRow' =
      | row => Init.rowError ("name+charge", row)
 
 fun listChargesWithNames trn =
-    C.map (getDb ()) mkChargeRow' ($`SELECT name, trn, usr, amount FROM Charge, WebUser
+    C.map (getDb ()) mkChargeRow' ($`SELECT name, trn, usr, amount, app FROM Charge, WebUser
 			             WHERE trn = ^(C.intToSql trn)
 					AND usr = id
 				     ORDER BY name`)
diff --git a/poll.sml b/poll.sml
index 987c5e2..32e588d 100644
--- a/poll.sml
+++ b/poll.sml
@@ -196,7 +196,7 @@ fun noDupes l =
       | h::t => List.all (fn x => x <> h) t andalso noDupes t
 
 fun listVoters cho =
-    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined
+    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app
 			          FROM WebUser, Vote
 				  WHERE usr = id
 				     AND cho = ^(C.intToSql cho)