diff options
author | Marko Pušnik <marko.pusnik@guru.si> | 2015-10-12 14:27:52 +0200 |
---|---|---|
committer | Marko Pušnik <marko.pusnik@guru.si> | 2015-10-12 14:27:52 +0200 |
commit | 104a1169a275c4cc023b0cc03abed9103d1b9abd (patch) | |
tree | 429fdd2ea98988260108df097834c0c4cc99b88a /db/models.py | |
parent | 3b2eb75e35aea371e4930737a4ce3d884fd3a92d (diff) | |
parent | f7e6d93a890ca74281fffb8e9d59864073c30497 (diff) |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-server
Diffstat (limited to 'db/models.py')
-rw-r--r-- | db/models.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/db/models.py b/db/models.py index 4eda2ba..17f9681 100644 --- a/db/models.py +++ b/db/models.py @@ -7,7 +7,6 @@ from . import get_connection, return_connection __all__ = ['CodeqUser', 'Solution'] - class CodeqUser(collections.namedtuple('CodeqUser', ['id', 'username', 'password', 'name', 'email', 'is_admin', 'is_active', 'date_joined', 'last_login'])): __sql_prefix = 'select id, username, password, name, email, is_admin, is_active, date_joined, last_login from codeq_user' @@ -27,8 +26,8 @@ class CodeqUser(collections.namedtuple('CodeqUser', ['id', 'username', 'password def solved_problems(user_id, language): return _run_sql('select g.identifier, p.identifier from solution s inner join problem p on p.id = s.problem_id inner join problem_group g on g.id = p.problem_group_id inner join language l on l.id = p.language_id where s.codeq_user_id = %s and l.identifier = %s and s.done = True', (user_id, language), fetch_one=False) -class Problem(collections.namedtuple('Problem', ['id', 'language_id', 'problem_group_id', 'name', 'identifier', 'is_visible'])): - __sql_prefix = 'select id, language_id, problem_group_id, name, identifier, is_visible from problem' +class Problem(collections.namedtuple('Problem', ['id', 'language_id', 'problem_group_id', 'identifier'])): + __sql_prefix = 'select id, language_id, problem_group_id, identifier from problem' @staticmethod def get(**kwargs): |