Fix active balance summing
authorAdam Chlipala <adamc@hcoop.net>
Sat, 21 Mar 2009 14:43:06 +0000 (14:43 +0000)
committerAdam Chlipala <adamc@hcoop.net>
Sat, 21 Mar 2009 14:43:06 +0000 (14:43 +0000)
balance.sml

index e400709..ffefdd5 100644 (file)
@@ -97,9 +97,12 @@ fun listBalanceUsers bal =
 
 fun sumOwnedBalances () =
     case C.oneRow (getDb ()) ($`SELECT SUM(amount)
-                               FROM Balance JOIN WebUser
-                                 ON Balance.name = WebUser.name
-                                   AND WebUser.bal = Balance.id`) of
+                               FROM Balance JOIN WebUser
+                                 ON Balance.name = WebUser.name
+                                   AND WebUser.bal = Balance.id
+                               JOIN Membership
+                                 ON Membership.usr = WebUser.id
+                                   AND Membership.grp = 1`) of
        [amt] => C.realFromSql amt
       | _ => raise Fail "sumOwnedBalance: no rows"