try:\r
player = DBSession.query(Player).filter_by(player_id=player_id).one()\r
\r
- weapon_stats = DBSession.query("descr", "actual_total", \r
+ weapon_stats = DBSession.query("descr", "weapon_cd", "actual_total", \r
"max_total", "hit_total", "fired_total", "frags_total").\\r
from_statement(\r
- "select cw.descr, sum(actual) actual_total, "\r
+ "select cw.descr, cw.weapon_cd, sum(actual) actual_total, "\r
"sum(max) max_total, sum(hit) hit_total, "\r
"sum(fired) fired_total, sum(frags) frags_total "\r
"from xonstat.player_weapon_stats ws, xonstat.cd_weapon cw "\r
"where ws.weapon_cd = cw.weapon_cd "\r
"and player_id = :player_id "\r
- "group by descr "\r
+ "group by descr, cw.weapon_cd "\r
"order by descr"\r
).params(player_id=player_id).all()\r
\r