Skip to content

GitLab

Commit 5be71da1 authored by Robert Czechowski's avatar Robert Czechowski Committed by Robert Czechowski
Browse files

Add new database field 'requires_contest' in contest

parent aa893de9
Hide whitespace changes
Inline Side-by-side
migrations/postgres/0002_alter_contest_user_add_requires_contest.sql 0 → 100644
View file @ 5be71da1
ALTER TABLE contest ADD COLUMN requires_contest TEXT;
migrations/sqlite_v2/0002_alter_contest_user_add_requires_contest.sql 0 → 100644
View file @ 5be71da1
ALTER TABLE contest ADD COLUMN requires_contest TEXT;
src/contestreader_yaml.rs
View file @ 5be71da1
...@@ -27,6 +27,7 @@ struct ContestYaml { ...@@ -27,6 +27,7 @@ struct ContestYaml {
public_listing: Option<bool>, public_listing: Option<bool>,
requires_login: Option<bool>, requires_login: Option<bool>,
requires_contest: Option<String>,
secret: Option<String>, secret: Option<String>,
message: Option<String>, message: Option<String>,
...@@ -62,6 +63,7 @@ pub fn parse_yaml(content: &str, filename: &str, directory: &str) -> Option<Cont ...@@ -62,6 +63,7 @@ pub fn parse_yaml(content: &str, filename: &str, directory: &str) -> Option<Cont
config.max_grade, config.max_grade,
config.position, config.position,
config.requires_login, config.requires_login,
config.requires_contest,
config.secret, config.secret,
config.message); config.message);
// TODO: Timeparsing should fail more pleasantly (-> Panic, thus shows message) // TODO: Timeparsing should fail more pleasantly (-> Panic, thus shows message)
......
src/db_conn.base.rs
View file @ 5be71da1
...@@ -125,7 +125,7 @@ impl MedalObject<Connection> for Contest { ...@@ -125,7 +125,7 @@ impl MedalObject<Connection> for Contest {
let query = "UPDATE contest let query = "UPDATE contest
SET location = $2,filename = $3, name = $4, duration = $5, public = $6, start_date = $7, SET location = $2,filename = $3, name = $4, duration = $5, public = $6, start_date = $7,
end_date = $8, min_grade = $9, max_grade = $10, positionalnumber = $11, end_date = $8, min_grade = $9, max_grade = $10, positionalnumber = $11,
requires_login = $12, secret = $13, message = $14 requires_login = $12, requires_contest = $13, secret = $14, message = $15
WHERE id = $1"; WHERE id = $1";
conn.execute(query, conn.execute(query,
&[&id, &[&id,
...@@ -140,6 +140,7 @@ impl MedalObject<Connection> for Contest { ...@@ -140,6 +140,7 @@ impl MedalObject<Connection> for Contest {
&self.max_grade, &self.max_grade,
&self.positionalnumber, &self.positionalnumber,
&self.requires_login, &self.requires_login,
&self.requires_contest,
&self.secret, &self.secret,
&self.message]) &self.message])
.unwrap(); .unwrap();
...@@ -147,8 +148,9 @@ impl MedalObject<Connection> for Contest { ...@@ -147,8 +148,9 @@ impl MedalObject<Connection> for Contest {
} }
None => { None => {
let query = "INSERT INTO contest (location, filename, name, duration, public, start_date, end_date, let query = "INSERT INTO contest (location, filename, name, duration, public, start_date, end_date,
min_grade, max_grade, positionalnumber, requires_login, secret, message) min_grade, max_grade, positionalnumber, requires_login,
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)"; requires_contest, secret, message)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)";
conn.execute(query, conn.execute(query,
&[&self.location, &[&self.location,
&self.filename, &self.filename,
...@@ -161,6 +163,7 @@ impl MedalObject<Connection> for Contest { ...@@ -161,6 +163,7 @@ impl MedalObject<Connection> for Contest {
&self.max_grade, &self.max_grade,
&self.positionalnumber, &self.positionalnumber,
&self.requires_login, &self.requires_login,
&self.requires_contest,
&self.secret, &self.secret,
&self.message]) &self.message])
.unwrap(); .unwrap();
...@@ -996,7 +999,7 @@ impl MedalConnection for Connection { ...@@ -996,7 +999,7 @@ impl MedalConnection for Connection {
fn get_contest_list(&self) -> Vec<Contest> { fn get_contest_list(&self) -> Vec<Contest> {
let query = "SELECT id, location, filename, name, duration, public, start_date, end_date, min_grade, max_grade, let query = "SELECT id, location, filename, name, duration, public, start_date, end_date, min_grade, max_grade,
positionalnumber, requires_login, secret, message positionalnumber, requires_login, requires_contest, secret, message
FROM contest FROM contest
ORDER BY positionalnumber"; ORDER BY positionalnumber";
self.query_map_many(query, &[], |row| Contest { id: Some(row.get(0)), self.query_map_many(query, &[], |row| Contest { id: Some(row.get(0)),
...@@ -1011,15 +1014,16 @@ impl MedalConnection for Connection { ...@@ -1011,15 +1014,16 @@ impl MedalConnection for Connection {
max_grade: row.get(9), max_grade: row.get(9),
positionalnumber: row.get(10), positionalnumber: row.get(10),
requires_login: row.get(11), requires_login: row.get(11),
secret: row.get(12), requires_contest: row.get(12),
message: row.get(13), secret: row.get(13),
message: row.get(14),
taskgroups: Vec::new() }) taskgroups: Vec::new() })
.unwrap() .unwrap()
} }
fn get_contest_by_id(&self, contest_id: i32) -> Contest { fn get_contest_by_id(&self, contest_id: i32) -> Contest {
let query = "SELECT location, filename, name, duration, public, start_date, end_date, min_grade, max_grade, let query = "SELECT location, filename, name, duration, public, start_date, end_date, min_grade, max_grade,
requires_login, secret, message requires_login, requires_contest, secret, message
FROM contest FROM contest
WHERE id = $1"; WHERE id = $1";
self.query_map_one(query, &[&contest_id], |row| Contest { id: Some(contest_id), self.query_map_one(query, &[&contest_id], |row| Contest { id: Some(contest_id),
...@@ -1034,8 +1038,9 @@ impl MedalConnection for Connection { ...@@ -1034,8 +1038,9 @@ impl MedalConnection for Connection {
max_grade: row.get(8), max_grade: row.get(8),
positionalnumber: None, positionalnumber: None,
requires_login: row.get(9), requires_login: row.get(9),
secret: row.get(10), requires_contest: row.get(10),
message: row.get(11), secret: row.get(11),
message: row.get(12),
taskgroups: Vec::new() }) taskgroups: Vec::new() })
.unwrap() .unwrap()
.unwrap() // TODO: Should return Option? .unwrap() // TODO: Should return Option?
...@@ -1044,7 +1049,7 @@ impl MedalConnection for Connection { ...@@ -1044,7 +1049,7 @@ impl MedalConnection for Connection {
fn get_contest_by_id_complete(&self, contest_id: i32) -> Contest { fn get_contest_by_id_complete(&self, contest_id: i32) -> Contest {
let query = "SELECT contest.location, contest.filename, contest.name, contest.duration, contest.public, let query = "SELECT contest.location, contest.filename, contest.name, contest.duration, contest.public,
contest.start_date, contest.end_date, contest.min_grade, contest.max_grade, contest.start_date, contest.end_date, contest.min_grade, contest.max_grade,
contest.requires_login, contest.secret, contest.message, contest.requires_login, contest.requires_contest, contest.secret, contest.message,
taskgroup.id, taskgroup.name, taskgroup.id, taskgroup.name,
task.id, task.location, task.stars task.id, task.location, task.stars
FROM contest FROM contest
...@@ -1067,16 +1072,17 @@ impl MedalConnection for Connection { ...@@ -1067,16 +1072,17 @@ impl MedalConnection for Connection {
max_grade: row.get(8), max_grade: row.get(8),
positionalnumber: None, positionalnumber: None,
requires_login: row.get(9), requires_login: row.get(9),
secret: row.get(10), requires_contest: row.get(10),
message: row.get(11), secret: row.get(11),
message: row.get(12),
taskgroups: Vec::new() }, taskgroups: Vec::new() },
Taskgroup { id: Some(row.get(12)), Taskgroup { id: Some(row.get(13)),
contest: contest_id, contest: contest_id,
name: row.get(13), name: row.get(14),
active: true, active: true,
positionalnumber: None, positionalnumber: None,
tasks: Vec::new() }, tasks: Vec::new() },
Task { id: Some(row.get(14)), taskgroup: row.get(12), location: row.get(15), stars: row.get(16) }) Task { id: Some(row.get(15)), taskgroup: row.get(13), location: row.get(16), stars: row.get(17) })
}) })
.unwrap(); .unwrap();
let mut taskgroupcontest_iter = taskgroupcontest.into_iter(); let mut taskgroupcontest_iter = taskgroupcontest.into_iter();
...@@ -1103,7 +1109,7 @@ impl MedalConnection for Connection { ...@@ -1103,7 +1109,7 @@ impl MedalConnection for Connection {
fn get_contest_by_id_partial(&self, contest_id: i32) -> Contest { fn get_contest_by_id_partial(&self, contest_id: i32) -> Contest {
let query = "SELECT contest.location, contest.filename, contest.name, contest.duration, contest.public, let query = "SELECT contest.location, contest.filename, contest.name, contest.duration, contest.public,
contest.start_date, contest.end_date, contest.min_grade, contest.max_grade, contest.start_date, contest.end_date, contest.min_grade, contest.max_grade,
contest.requires_login, contest.secret, contest.message, contest.requires_login, contest.requires_contest, contest.secret, contest.message,
taskgroup.id, taskgroup.name taskgroup.id, taskgroup.name
FROM contest FROM contest
JOIN taskgroup ON contest.id = taskgroup.contest JOIN taskgroup ON contest.id = taskgroup.contest
...@@ -1122,12 +1128,13 @@ impl MedalConnection for Connection { ...@@ -1122,12 +1128,13 @@ impl MedalConnection for Connection {
max_grade: row.get(8), max_grade: row.get(8),
positionalnumber: None, positionalnumber: None,
requires_login: row.get(9), requires_login: row.get(9),
secret: row.get(10), requires_contest: row.get(10),
message: row.get(11), secret: row.get(11),
message: row.get(12),
taskgroups: Vec::new() }, taskgroups: Vec::new() },
Taskgroup { id: Some(row.get(12)), Taskgroup { id: Some(row.get(13)),
contest: contest_id, contest: contest_id,
name: row.get(13), name: row.get(14),
active: true, active: true,
positionalnumber: None, positionalnumber: None,
tasks: Vec::new() }) tasks: Vec::new() })
...@@ -1169,7 +1176,8 @@ impl MedalConnection for Connection { ...@@ -1169,7 +1176,8 @@ impl MedalConnection for Connection {
fn get_all_participations_complete(&self, session_id: i32) -> Vec<(Participation, Contest)> { fn get_all_participations_complete(&self, session_id: i32) -> Vec<(Participation, Contest)> {
let query = "SELECT participation.start_date, contest.id, location, filename, name, duration, public, let query = "SELECT participation.start_date, contest.id, location, filename, name, duration, public,
contest.start_date, end_date, min_grade, max_grade, requires_login, secret, message contest.start_date, end_date, min_grade, max_grade, requires_login, requires_contest,
secret, message
FROM participation FROM participation
JOIN contest ON participation.contest = contest.id JOIN contest ON participation.contest = contest.id
WHERE participation.session = $1"; WHERE participation.session = $1";
...@@ -1187,8 +1195,9 @@ impl MedalConnection for Connection { ...@@ -1187,8 +1195,9 @@ impl MedalConnection for Connection {
max_grade: row.get(10), max_grade: row.get(10),
positionalnumber: None, positionalnumber: None,
requires_login: row.get(11), requires_login: row.get(11),
secret: row.get(12), requires_contest: row.get(12),
message: row.get(13), secret: row.get(13),
message: row.get(14),
taskgroups: Vec::new() }) taskgroups: Vec::new() })
}) })
.unwrap() .unwrap()
...@@ -1230,7 +1239,7 @@ impl MedalConnection for Connection { ...@@ -1230,7 +1239,7 @@ impl MedalConnection for Connection {
let query = "SELECT task.location, task.stars, taskgroup.id, taskgroup.name, taskgroup.active, contest.id, let query = "SELECT task.location, task.stars, taskgroup.id, taskgroup.name, taskgroup.active, contest.id,
contest.location, contest.filename, contest.name, contest.duration, contest.public, contest.location, contest.filename, contest.name, contest.duration, contest.public,
contest.start_date, contest.end_date, contest.min_grade, contest.max_grade, contest.start_date, contest.end_date, contest.min_grade, contest.max_grade,
contest.requires_login, contest.secret, contest.message contest.requires_login, contest.requires_contest, contest.secret, contest.message
FROM contest FROM contest
JOIN taskgroup ON taskgroup.contest = contest.id JOIN taskgroup ON taskgroup.contest = contest.id
JOIN task ON task.taskgroup = taskgroup.id JOIN task ON task.taskgroup = taskgroup.id
...@@ -1255,8 +1264,9 @@ impl MedalConnection for Connection { ...@@ -1255,8 +1264,9 @@ impl MedalConnection for Connection {
max_grade: row.get(14), max_grade: row.get(14),
positionalnumber: None, positionalnumber: None,
requires_login: row.get(15), requires_login: row.get(15),
secret: row.get(16), requires_contest: row.get(16),
message: row.get(17), secret: row.get(17),
message: row.get(18),
taskgroups: Vec::new() }) taskgroups: Vec::new() })
}) })
.unwrap() .unwrap()
......
src/db_conn_postgres.rs
View file @ 5be71da1
...@@ -244,7 +244,7 @@ impl MedalObject<Connection> for Contest { ...@@ -244,7 +244,7 @@ impl MedalObject<Connection> for Contest {
let query = "UPDATE contest let query = "UPDATE contest
SET location = $2,filename = $3, name = $4, duration = $5, public = $6, start_date = $7, SET location = $2,filename = $3, name = $4, duration = $5, public = $6, start_date = $7,
end_date = $8, min_grade = $9, max_grade = $10, positionalnumber = $11, end_date = $8, min_grade = $9, max_grade = $10, positionalnumber = $11,
requires_login = $12, secret = $13, message = $14 requires_login = $12, requires_contest = $13, secret = $14, message = $15
WHERE id = $1"; WHERE id = $1";
conn.execute(query, conn.execute(query,
&[&id, &[&id,
...@@ -259,6 +259,7 @@ impl MedalObject<Connection> for Contest { ...@@ -259,6 +259,7 @@ impl MedalObject<Connection> for Contest {
&self.max_grade, &self.max_grade,
&self.positionalnumber, &self.positionalnumber,
&self.requires_login, &self.requires_login,
&self.requires_contest,
&self.secret, &self.secret,
&self.message]) &self.message])
.unwrap(); .unwrap();
...@@ -266,8 +267,9 @@ impl MedalObject<Connection> for Contest { ...@@ -266,8 +267,9 @@ impl MedalObject<Connection> for Contest {
} }
None => { None => {
let query = "INSERT INTO contest (location, filename, name, duration, public, start_date, end_date, let query = "INSERT INTO contest (location, filename, name, duration, public, start_date, end_date,
min_grade, max_grade, positionalnumber, requires_login, secret, message) min_grade, max_grade, positionalnumber, requires_login,
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)"; requires_contest, secret, message)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)";
conn.execute(query, conn.execute(query,
&[&self.location, &[&self.location,
&self.filename, &self.filename,
...@@ -280,6 +282,7 @@ impl MedalObject<Connection> for Contest { ...@@ -280,6 +282,7 @@ impl MedalObject<Connection> for Contest {
&self.max_grade, &self.max_grade,
&self.positionalnumber, &self.positionalnumber,
&self.requires_login, &self.requires_login,
&self.requires_contest,
&self.secret, &self.secret,
&self.message]) &self.message])
.unwrap(); .unwrap();
...@@ -1115,7 +1118,7 @@ impl MedalConnection for Connection { ...@@ -1115,7 +1118,7 @@ impl MedalConnection for Connection {
fn get_contest_list(&self) -> Vec<Contest> { fn get_contest_list(&self) -> Vec<Contest> {
let query = "SELECT id, location, filename, name, duration, public, start_date, end_date, min_grade, max_grade, let query = "SELECT id, location, filename, name, duration, public, start_date, end_date, min_grade, max_grade,
positionalnumber, requires_login, secret, message positionalnumber, requires_login, requires_contest, secret, message
FROM contest FROM contest
ORDER BY positionalnumber"; ORDER BY positionalnumber";
self.query_map_many(query, &[], |row| Contest { id: Some(row.get(0)), self.query_map_many(query, &[], |row| Contest { id: Some(row.get(0)),
...@@ -1130,15 +1133,16 @@ impl MedalConnection for Connection { ...@@ -1130,15 +1133,16 @@ impl MedalConnection for Connection {
max_grade: row.get(9), max_grade: row.get(9),
positionalnumber: row.get(10), positionalnumber: row.get(10),
requires_login: row.get(11), requires_login: row.get(11),
secret: row.get(12), requires_contest: row.get(12),
message: row.get(13), secret: row.get(13),
message: row.get(14),
taskgroups: Vec::new() }) taskgroups: Vec::new() })
.unwrap() .unwrap()
} }
fn get_contest_by_id(&self, contest_id: i32) -> Contest { fn get_contest_by_id(&self, contest_id: i32) -> Contest {
let query = "SELECT location, filename, name, duration, public, start_date, end_date, min_grade, max_grade, let query = "SELECT location, filename, name, duration, public, start_date, end_date, min_grade, max_grade,
requires_login, secret, message requires_login, requires_contest, secret, message
FROM contest FROM contest
WHERE id = $1"; WHERE id = $1";
self.query_map_one(query, &[&contest_id], |row| Contest { id: Some(contest_id), self.query_map_one(query, &[&contest_id], |row| Contest { id: Some(contest_id),
...@@ -1153,8 +1157,9 @@ impl MedalConnection for Connection { ...@@ -1153,8 +1157,9 @@ impl MedalConnection for Connection {
max_grade: row.get(8), max_grade: row.get(8),
positionalnumber: None, positionalnumber: None,
requires_login: row.get(9), requires_login: row.get(9),
secret: row.get(10), requires_contest: row.get(10),
message: row.get(11), secret: row.get(11),
message: row.get(12),
taskgroups: Vec::new() }) taskgroups: Vec::new() })
.unwrap() .unwrap()
.unwrap() // TODO: Should return Option? .unwrap() // TODO: Should return Option?
...@@ -1163,7 +1168,7 @@ impl MedalConnection for Connection { ...@@ -1163,7 +1168,7 @@ impl MedalConnection for Connection {
fn get_contest_by_id_complete(&self, contest_id: i32) -> Contest { fn get_contest_by_id_complete(&self, contest_id: i32) -> Contest {
let query = "SELECT contest.location, contest.filename, contest.name, contest.duration, contest.public, let query = "SELECT contest.location, contest.filename, contest.name, contest.duration, contest.public,
contest.start_date, contest.end_date, contest.min_grade, contest.max_grade, contest.start_date, contest.end_date, contest.min_grade, contest.max_grade,
contest.requires_login, contest.secret, contest.message, contest.requires_login, contest.requires_contest, contest.secret, contest.message,
taskgroup.id, taskgroup.name, taskgroup.id, taskgroup.name,
task.id, task.location, task.stars task.id, task.location, task.stars
FROM contest FROM contest
...@@ -1186,16 +1191,17 @@ impl MedalConnection for Connection { ...@@ -1186,16 +1191,17 @@ impl MedalConnection for Connection {
max_grade: row.get(8), max_grade: row.get(8),
positionalnumber: None, positionalnumber: None,
requires_login: row.get(9), requires_login: row.get(9),
secret: row.get(10), requires_contest: row.get(10),
message: row.get(11), secret: row.get(11),
message: row.get(12),
taskgroups: Vec::new() }, taskgroups: Vec::new() },
Taskgroup { id: Some(row.get(12)), Taskgroup { id: Some(row.get(13)),
contest: contest_id, contest: contest_id,
name: row.get(13), name: row.get(14),
active: true, active: true,
positionalnumber: None, positionalnumber: None,
tasks: Vec::new() }, tasks: Vec::new() },
Task { id: Some(row.get(14)), taskgroup: row.get(12), location: row.get(15), stars: row.get(16) }) Task { id: Some(row.get(15)), taskgroup: row.get(13), location: row.get(16), stars: row.get(17) })
}) })
.unwrap(); .unwrap();
let mut taskgroupcontest_iter = taskgroupcontest.into_iter(); let mut taskgroupcontest_iter = taskgroupcontest.into_iter();
...@@ -1222,7 +1228,7 @@ impl MedalConnection for Connection { ...@@ -1222,7 +1228,7 @@ impl MedalConnection for Connection {
fn get_contest_by_id_partial(&self, contest_id: i32) -> Contest { fn get_contest_by_id_partial(&self, contest_id: i32) -> Contest {
let query = "SELECT contest.location, contest.filename, contest.name, contest.duration, contest.public, let query = "SELECT contest.location, contest.filename, contest.name, contest.duration, contest.public,
contest.start_date, contest.end_date, contest.min_grade, contest.max_grade, contest.start_date, contest.end_date, contest.min_grade, contest.max_grade,
contest.requires_login, contest.secret, contest.message, contest.requires_login, contest.requires_contest, contest.secret, contest.message,
taskgroup.id, taskgroup.name taskgroup.id, taskgroup.name
FROM contest FROM contest
JOIN taskgroup ON contest.id = taskgroup.contest JOIN taskgroup ON contest.id = taskgroup.contest
...@@ -1241,12 +1247,13 @@ impl MedalConnection for Connection { ...@@ -1241,12 +1247,13 @@ impl MedalConnection for Connection {
max_grade: row.get(8), max_grade: row.get(8),
positionalnumber: None, positionalnumber: None,
requires_login: row.get(9), requires_login: row.get(9),
secret: row.get(10), requires_contest: row.get(10),
message: row.get(11), secret: row.get(11),
message: row.get(12),
taskgroups: Vec::new() }, taskgroups: Vec::new() },
Taskgroup { id: Some(row.get(12)), Taskgroup { id: Some(row.get(13)),
contest: contest_id, contest: contest_id,
name: row.get(13), name: row.get(14),
active: true, active: true,
positionalnumber: None, positionalnumber: None,
tasks: Vec::new() }) tasks: Vec::new() })
...@@ -1288,7 +1295,8 @@ impl MedalConnection for Connection { ...@@ -1288,7 +1295,8 @@ impl MedalConnection for Connection {
fn get_all_participations_complete(&self, session_id: i32) -> Vec<(Participation, Contest)> { fn get_all_participations_complete(&self, session_id: i32) -> Vec<(Participation, Contest)> {
let query = "SELECT participation.start_date, contest.id, location, filename, name, duration, public, let query = "SELECT participation.start_date, contest.id, location, filename, name, duration, public,
contest.start_date, end_date, min_grade, max_grade, requires_login, secret, message contest.start_date, end_date, min_grade, max_grade, requires_login, requires_contest,
secret, message
FROM participation FROM participation
JOIN contest ON participation.contest = contest.id JOIN contest ON participation.contest = contest.id
WHERE participation.session = $1"; WHERE participation.session = $1";
...@@ -1306,8 +1314,9 @@ impl MedalConnection for Connection { ...@@ -1306,8 +1314,9 @@ impl MedalConnection for Connection {
max_grade: row.get(10), max_grade: row.get(10),
positionalnumber: None, positionalnumber: None,
requires_login: row.get(11), requires_login: row.get(11),
secret: row.get(12), requires_contest: row.get(12),
message: row.get(13), secret: row.get(13),
message: row.get(14),
taskgroups: Vec::new() }) taskgroups: Vec::new() })
}) })
.unwrap() .unwrap()
...@@ -1349,7 +1358,7 @@ impl MedalConnection for Connection { ...@@ -1349,7 +1358,7 @@ impl MedalConnection for Connection {
let query = "SELECT task.location, task.stars, taskgroup.id, taskgroup.name, taskgroup.active, contest.id, let query = "SELECT task.location, task.stars, taskgroup.id, taskgroup.name, taskgroup.active, contest.id,
contest.location, contest.filename, contest.name, contest.duration, contest.public, contest.location, contest.filename, contest.name, contest.duration, contest.public,
contest.start_date, contest.end_date, contest.min_grade, contest.max_grade, contest.start_date, contest.end_date, contest.min_grade, contest.max_grade,
contest.requires_login, contest.secret, contest.message contest.requires_login, contest.requires_contest, contest.secret, contest.message
FROM contest FROM contest
JOIN taskgroup ON taskgroup.contest = contest.id JOIN taskgroup ON taskgroup.contest = contest.id
JOIN task ON task.taskgroup = taskgroup.id JOIN task ON task.taskgroup = taskgroup.id
...@@ -1374,8 +1383,9 @@ impl MedalConnection for Connection { ...@@ -1374,8 +1383,9 @@ impl MedalConnection for Connection {
max_grade: row.get(14), max_grade: row.get(14),
positionalnumber: None, positionalnumber: None,
requires_login: row.get(15), requires_login: row.get(15),
secret: row.get(16), requires_contest: row.get(16),
message: row.get(17), secret: row.get(17),
message: row.get(18),
taskgroups: Vec::new() }) taskgroups: Vec::new() })
}) })
.unwrap() .unwrap()
......
src/db_conn_sqlite_new.rs
View file @ 5be71da1
...@@ -244,7 +244,7 @@ impl MedalObject<Connection> for Contest { ...@@ -244,7 +244,7 @@ impl MedalObject<Connection> for Contest {
let query = "UPDATE contest let query = "UPDATE contest
SET location = ?2,filename = ?3, name = ?4, duration = ?5, public = ?6, start_date = ?7, SET location = ?2,filename = ?3, name = ?4, duration = ?5, public = ?6, start_date = ?7,
end_date = ?8, min_grade = ?9, max_grade = ?10, positionalnumber = ?11, end_date = ?8, min_grade = ?9, max_grade = ?10, positionalnumber = ?11,
requires_login = ?12, secret = ?13, message = ?14 requires_login = ?12, requires_contest = ?13, secret = ?14, message = ?15
WHERE id = ?1"; WHERE id = ?1";
conn.execute(query, conn.execute(query,
&[&id, &[&id,
...@@ -259,6 +259,7 @@ impl MedalObject<Connection> for Contest { ...@@ -259,6 +259,7 @@ impl MedalObject<Connection> for Contest {
&self.max_grade, &self.max_grade,
&self.positionalnumber, &self.positionalnumber,
&self.requires_login, &self.requires_login,
&self.requires_contest,
&self.secret, &self.secret,
&self.message]) &self.message])
.unwrap(); .unwrap();
...@@ -266,8 +267,9 @@ impl MedalObject<Connection> for Contest { ...@@ -266,8 +267,9 @@ impl MedalObject<Connection> for Contest {
} }
None => { None => {
let query = "INSERT INTO contest (location, filename, name, duration, public, start_date, end_date, let query = "INSERT INTO contest (location, filename, name, duration, public, start_date, end_date,
min_grade, max_grade, positionalnumber, requires_login, secret, message) min_grade, max_grade, positionalnumber, requires_login,
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)"; requires_contest, secret, message)
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14)";
conn.execute(query, conn.execute(query,
&[&self.location, &[&self.location,
&self.filename, &self.filename,
...@@ -280,6 +282,7 @@ impl MedalObject<Connection> for Contest { ...@@ -280,6 +282,7 @@ impl MedalObject<Connection> for Contest {
&self.max_grade, &self.max_grade,
&self.positionalnumber, &self.positionalnumber,
&self.requires_login, &self.requires_login,
&self.requires_contest,
&self.secret, &self.secret,
&self.message]) &self.message])
.unwrap(); .unwrap();
...@@ -1115,7 +1118,7 @@ impl MedalConnection for Connection { ...@@ -1115,7 +1118,7 @@ impl MedalConnection for Connection {
fn get_contest_list(&self) -> Vec<Contest> { fn get_contest_list(&self) -> Vec<Contest> {
let query = "SELECT id, location, filename, name, duration, public, start_date, end_date, min_grade, max_grade, let query = "SELECT id, location, filename, name, duration, public, start_date, end_date, min_grade, max_grade,
positionalnumber, requires_login, secret, message positionalnumber, requires_login, requires_contest, secret, message
FROM contest FROM contest
ORDER BY positionalnumber"; ORDER BY positionalnumber";