From 80047246b77e03c100f420e322a630bf305c034f Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Thu, 26 May 2016 01:57:26 -0400 Subject: [PATCH] Fixing subqueries in MySQL --- CTFd/admin.py | 2 +- CTFd/scoreboard.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CTFd/admin.py b/CTFd/admin.py index 01770551..279f1fb0 100644 --- a/CTFd/admin.py +++ b/CTFd/admin.py @@ -566,7 +566,7 @@ def admin_scoreboard(): .filter(Teams.id == Awards.teamid) \ .group_by(Teams.id) - results = union_all(scores, awards) + results = union_all(scores, awards).alias('results') standings = db.session.query(results.columns.teamid, results.columns.name, results.columns.banned, db.func.sum(results.columns.score).label('score')) \ diff --git a/CTFd/scoreboard.py b/CTFd/scoreboard.py index e18d6f81..84ed5165 100644 --- a/CTFd/scoreboard.py +++ b/CTFd/scoreboard.py @@ -22,7 +22,7 @@ def scoreboard_view(): .filter(Teams.id == Awards.teamid) \ .group_by(Teams.id) - results = union_all(scores, awards) + results = union_all(scores, awards).alias('results') standings = db.session.query(results.columns.teamid, results.columns.name, db.func.sum(results.columns.score).label('score')) \ @@ -48,7 +48,7 @@ def scores(): .filter(Teams.id==Awards.teamid)\ .group_by(Teams.id) - results = union_all(scores, awards) + results = union_all(scores, awards).alias('results') standings = db.session.query(results.columns.teamid, results.columns.name, db.func.sum(results.columns.score).label('score'))\ .group_by(results.columns.teamid)\ @@ -87,7 +87,7 @@ def topteams(count): .filter(Teams.id == Awards.teamid) \ .group_by(Teams.id) - results = union_all(scores, awards) + results = union_all(scores, awards).alias('results') standings = db.session.query(results.columns.teamid, results.columns.name, db.func.sum(results.columns.score).label('score')) \