HCoop
/
hcoop
/
zz_old
/
portal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
57215bc
)
SQL error in poll
author
adamch
<adamch>
Tue, 31 Oct 2006 02:51:07 +0000
(
02:51
+0000)
committer
adamch
<adamch>
Tue, 31 Oct 2006 02:51:07 +0000
(
02:51
+0000)
money.sml
patch
|
blob
|
blame
|
history
poll.sml
patch
|
blob
|
blame
|
history
diff --git
a/money.sml
b/money.sml
index
d9e14d9
..
4689491
100644
(file)
--- a/
money.sml
+++ b/
money.sml
@@
-86,7
+86,7
@@
val mkUserRow' =
| row => Init.rowError ("listUsers", row)
fun listUsers trn =
| row => Init.rowError ("listUsers", row)
fun listUsers trn =
- C.map (getDb ()) mkUserRow' ($`SELECT trn, id, name, rname, bal, joined, app
+ C.map (getDb ()) mkUserRow' ($`SELECT trn, id, name, rname, bal, joined, app
, shares
FROM WebUser LEFT OUTER JOIN Charge ON usr = id AND trn = ^(C.intToSql trn)
ORDER BY name`)
FROM WebUser LEFT OUTER JOIN Charge ON usr = id AND trn = ^(C.intToSql trn)
ORDER BY name`)
diff --git
a/poll.sml
b/poll.sml
index
e549218
..
1d08f70
100644
(file)
--- 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 =
| 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, app
+ C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app
, shares
FROM WebUser, Vote
WHERE usr = id
AND cho = ^(C.intToSql cho)
FROM WebUser, Vote
WHERE usr = id
AND cho = ^(C.intToSql cho)
@@
-209,7
+209,7
@@
fun countVoters pol =
| row => Init.rowError ("countVoters", row)
fun listPollVoters pol =
| row => Init.rowError ("countVoters", row)
fun listPollVoters pol =
- C.map (getDb ()) mkUserRow ($`SELECT DISTINCT WebUser.id, name, rname, bal, joined, app
+ C.map (getDb ()) mkUserRow ($`SELECT DISTINCT WebUser.id, name, rname, bal, joined, app
, shares
FROM WebUser, Vote JOIN PollChoice ON cho = PollChoice.id
WHERE pol = ^(C.intToSql pol)
AND usr = WebUser.id
FROM WebUser, Vote JOIN PollChoice ON cho = PollChoice.id
WHERE pol = ^(C.intToSql pol)
AND usr = WebUser.id