Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
medal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
39
Issues
39
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bwinf
medal
Commits
414ae08d
Commit
414ae08d
authored
Nov 11, 2020
by
Robert Czechowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new database field 'requires_contest' in contest
parent
a7ec45a7
Pipeline
#901
passed with stage
in 4 minutes and 6 seconds
Changes
8
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
119 additions
and
79 deletions
+119
-79
migrations/postgres/0002_alter_contest_user_add_requires_contest.sql
...postgres/0002_alter_contest_user_add_requires_contest.sql
+1
-0
migrations/sqlite_v2/0002_alter_contest_user_add_requires_contest.sql
...qlite_v2/0002_alter_contest_user_add_requires_contest.sql
+1
-0
src/contestreader_yaml.rs
src/contestreader_yaml.rs
+2
-0
src/db_conn.base.rs
src/db_conn.base.rs
+36
-26
src/db_conn_postgres.rs
src/db_conn_postgres.rs
+36
-26
src/db_conn_sqlite_new.rs
src/db_conn_sqlite_new.rs
+36
-26
src/db_objects.rs
src/db_objects.rs
+3
-1
src/main.rs
src/main.rs
+4
-0
No files found.
migrations/postgres/0002_alter_contest_user_add_requires_contest.sql
0 → 100644
View file @
414ae08d
ALTER
TABLE
contest
ADD
COLUMN
requires_contest
TEXT
;
migrations/sqlite_v2/0002_alter_contest_user_add_requires_contest.sql
0 → 100644
View file @
414ae08d
ALTER
TABLE
contest
ADD
COLUMN
requires_contest
TEXT
;
src/contestreader_yaml.rs
View file @
414ae08d
...
...
@@ -27,6 +27,7 @@ struct ContestYaml {
public_listing
:
Option
<
bool
>
,
requires_login
:
Option
<
bool
>
,
requires_contest
:
Option
<
String
>
,
secret
:
Option
<
String
>
,
message
:
Option
<
String
>
,
...
...
@@ -62,6 +63,7 @@ pub fn parse_yaml(content: &str, filename: &str, directory: &str) -> Option<Cont
config
.max_grade
,
config
.position
,
config
.requires_login
,
config
.requires_contest
,
config
.secret
,
config
.message
);
// TODO: Timeparsing should fail more pleasantly (-> Panic, thus shows message)
...
...
src/db_conn.base.rs
View file @
414ae08d
This diff is collapsed.
Click to expand it.
src/db_conn_postgres.rs
View file @
414ae08d
This diff is collapsed.
Click to expand it.
src/db_conn_sqlite_new.rs
View file @
414ae08d
This diff is collapsed.
Click to expand it.
src/db_objects.rs
View file @
414ae08d
...
...
@@ -89,6 +89,7 @@ pub struct Contest {
pub
max_grade
:
Option
<
i32
>
,
pub
positionalnumber
:
Option
<
i32
>
,
pub
requires_login
:
Option
<
bool
>
,
pub
requires_contest
:
Option
<
String
>
,
pub
secret
:
Option
<
String
>
,
pub
taskgroups
:
Vec
<
Taskgroup
>
,
pub
message
:
Option
<
String
>
,
...
...
@@ -169,7 +170,7 @@ impl Contest {
#[allow(clippy::too_many_arguments)]
pub
fn
new
(
location
:
String
,
filename
:
String
,
name
:
String
,
duration
:
i32
,
public
:
bool
,
start
:
Option
<
Timespec
>
,
end
:
Option
<
Timespec
>
,
min_grade
:
Option
<
i32
>
,
max_grade
:
Option
<
i32
>
,
positionalnumber
:
Option
<
i32
>
,
requires_login
:
Option
<
bool
>
,
secret
:
Option
<
String
>
,
positionalnumber
:
Option
<
i32
>
,
requires_login
:
Option
<
bool
>
,
requires_contest
:
Option
<
String
>
,
secret
:
Option
<
String
>
,
message
:
Option
<
String
>
)
->
Self
{
...
...
@@ -185,6 +186,7 @@ impl Contest {
max_grade
,
positionalnumber
,
requires_login
,
requires_contest
,
secret
,
message
,
taskgroups
:
Vec
::
new
()
}
...
...
src/main.rs
View file @
414ae08d
...
...
@@ -297,6 +297,7 @@ mod tests {
None
,
None
,
None
,
None
,
None
);
contest
.save
(
&
conn
);
...
...
@@ -313,6 +314,7 @@ mod tests {
None
,
None
,
None
,
None
,
None
);
let
mut
taskgroup
=
Taskgroup
::
new
(
"TaskgroupName"
.to_string
(),
None
);
let
task
=
Task
::
new
(
"taskdir1"
.to_string
(),
3
);
// ID: 1
...
...
@@ -335,6 +337,7 @@ mod tests {
None
,
None
,
None
,
None
,
None
);
let
mut
taskgroup
=
Taskgroup
::
new
(
"TaskgroupName"
.to_string
(),
None
);
let
task
=
Task
::
new
(
"taskdir1"
.to_string
(),
3
);
// ID: 3
...
...
@@ -357,6 +360,7 @@ mod tests {
None
,
None
,
None
,
None
,
None
);
let
mut
taskgroup
=
Taskgroup
::
new
(
"TaskgroupRenameName"
.to_string
(),
None
);
let
task
=
Task
::
new
(
"taskdir1"
.to_string
(),
3
);
// ID: 5
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment