diff options
| author | Yorhel <git@yorhel.nl> | 2015-04-27 09:35:38 +0200 |
|---|---|---|
| committer | Yorhel <git@yorhel.nl> | 2015-04-27 09:35:38 +0200 |
| commit | 141fbfdb168168b478fc0f5265cc9ee572519434 (patch) | |
| tree | 8d2a1b7b92cb40facf6b1f7bcf4ad71501095bd5 /lib/Multi/Feed.pm | |
| parent | 0a53c963193744f2961d1f54ace9a444b265e4d4 (diff) | |
Multi: Backport staff database changes from master branch
Includes changes from 5926ce95395976456c0e15895d13491a81819087 and
e20b19ce400ccf382a969a51777e0678ff8d44db
Diffstat (limited to 'lib/Multi/Feed.pm')
| -rw-r--r-- | lib/Multi/Feed.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Multi/Feed.pm b/lib/Multi/Feed.pm index d2e97034..d2161aec 100644 --- a/lib/Multi/Feed.pm +++ b/lib/Multi/Feed.pm @@ -44,14 +44,16 @@ sub generate { # changes pg_cmd q{ - SELECT '/'||c.type||COALESCE(vr.vid, rr.rid, pr.pid, cr.cid)||'.'||c.rev AS id, - COALESCE(vr.title, rr.title, pr.name, cr.name) AS title, extract('epoch' from c.added) AS updated, + SELECT '/'||c.type||COALESCE(vr.vid, rr.rid, pr.pid, cr.cid, sr.sid)||'.'||c.rev AS id, + COALESCE(vr.title, rr.title, pr.name, cr.name, sa.name) AS title, extract('epoch' from c.added) AS updated, u.username, u.id AS uid, c.comments AS summary FROM changes c LEFT JOIN vn_rev vr ON c.type = 'v' AND c.id = vr.id LEFT JOIN releases_rev rr ON c.type = 'r' AND c.id = rr.id LEFT JOIN producers_rev pr ON c.type = 'p' AND c.id = pr.id LEFT JOIN chars_rev cr ON c.type = 'c' AND c.id = cr.id + LEFT JOIN staff_rev sr ON c.type = 's' AND c.id = sr.id + LEFT JOIN staff_alias sa ON sa.rid = sr.id AND sa.id = sr.aid JOIN users u ON u.id = c.requester WHERE c.requester <> 1 ORDER BY c.id DESC |