aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2026-02-01 04:14:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing subqueries in MySQL

Browse Source
This commit is contained in:
Kevin Chung
2016-05-26 01:57:26 -04:00
parent 29d3cb72d7
commit 80047246b7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CTFd/admin.py
View File

@@ -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')) \

6
CTFd/scoreboard.py
View File

@@ -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')) \