Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
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
42
Issues
42
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
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
d153c56e
Commit
d153c56e
authored
Sep 22, 2020
by
Robert Czechowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix contest export failing with postgres due to incorrect type expected from start_date field
parent
ed3c61df
Pipeline
#836
passed with stages
in 18 minutes and 41 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
11 deletions
+13
-11
src/core.rs
src/core.rs
+1
-2
src/db_conn.base.rs
src/db_conn.base.rs
+4
-3
src/db_conn_postgres.rs
src/db_conn_postgres.rs
+4
-3
src/db_conn_sqlite_new.rs
src/db_conn_sqlite_new.rs
+4
-3
No files found.
src/core.rs
View file @
d153c56e
...
...
@@ -1391,8 +1391,7 @@ pub fn admin_show_participation<T: MedalConnection>(conn: &T, user_id: i32, cont
fill_user_data
(
&
user
,
&
mut
data
);
data
.insert
(
"userid"
.to_string
(),
to_json
(
&
user
.id
));
let
participation
=
conn
.get_participation
(
user
.id
,
contest_id
)
.ok_or
(
MedalError
::
AccessDenied
)
?
;
let
participation
=
conn
.get_participation
(
user
.id
,
contest_id
)
.ok_or
(
MedalError
::
AccessDenied
)
?
;
data
.insert
(
"start_date"
.to_string
(),
to_json
(
&
self
::
time
::
strftime
(
"%FT%T%z"
,
&
self
::
time
::
at
(
participation
.start
))
.unwrap
()));
...
...
src/db_conn.base.rs
View file @
d153c56e
...
...
@@ -947,7 +947,8 @@ impl MedalConnection for Connection {
row
.get
::
<
_
,
Option
<
String
>>
(
16
),
row
.get
::
<
_
,
Option
<
String
>>
(
17
)),
row
.get
::
<
_
,
Option
<
i32
>>
(
18
),
row
.get
::
<
_
,
Option
<
String
>>
(
19
),
row
.get
::
<
_
,
Option
<
self
::
time
::
Timespec
>>
(
19
)
.map
(|
ts
|
self
::
time
::
strftime
(
"%FT%T%z"
,
&
self
::
time
::
at
(
ts
))
.unwrap
()),
points
))
.unwrap
();
})
...
...
@@ -1111,8 +1112,8 @@ impl MedalConnection for Connection {
WHERE session = $1
AND contest = $2"
;
self
.query_map_one
(
query
,
&
[
&
session_id
,
&
contest_id
],
|
row
|
Participation
{
contest
:
contest_id
,
user
:
session_id
,
start
:
row
.get
(
0
)
})
user
:
session_id
,
start
:
row
.get
(
0
)
})
.ok
()
?
}
...
...
src/db_conn_postgres.rs
View file @
d153c56e
...
...
@@ -1059,7 +1059,8 @@ impl MedalConnection for Connection {
row
.get
::
<
_
,
Option
<
String
>>
(
16
),
row
.get
::
<
_
,
Option
<
String
>>
(
17
)),
row
.get
::
<
_
,
Option
<
i32
>>
(
18
),
row
.get
::
<
_
,
Option
<
String
>>
(
19
),
row
.get
::
<
_
,
Option
<
self
::
time
::
Timespec
>>
(
19
)
.map
(|
ts
|
self
::
time
::
strftime
(
"%FT%T%z"
,
&
self
::
time
::
at
(
ts
))
.unwrap
()),
points
))
.unwrap
();
})
...
...
@@ -1223,8 +1224,8 @@ impl MedalConnection for Connection {
WHERE session = $1
AND contest = $2"
;
self
.query_map_one
(
query
,
&
[
&
session_id
,
&
contest_id
],
|
row
|
Participation
{
contest
:
contest_id
,
user
:
session_id
,
start
:
row
.get
(
0
)
})
user
:
session_id
,
start
:
row
.get
(
0
)
})
.ok
()
?
}
...
...
src/db_conn_sqlite_new.rs
View file @
d153c56e
...
...
@@ -1059,7 +1059,8 @@ impl MedalConnection for Connection {
row
.get
::
<
_
,
Option
<
String
>>
(
16
),
row
.get
::
<
_
,
Option
<
String
>>
(
17
)),
row
.get
::
<
_
,
Option
<
i32
>>
(
18
),
row
.get
::
<
_
,
Option
<
String
>>
(
19
),
row
.get
::
<
_
,
Option
<
self
::
time
::
Timespec
>>
(
19
)
.map
(|
ts
|
self
::
time
::
strftime
(
"%FT%T%z"
,
&
self
::
time
::
at
(
ts
))
.unwrap
()),
points
))
.unwrap
();
})
...
...
@@ -1223,8 +1224,8 @@ impl MedalConnection for Connection {
WHERE session = ?1
AND contest = ?2"
;
self
.query_map_one
(
query
,
&
[
&
session_id
,
&
contest_id
],
|
row
|
Participation
{
contest
:
contest_id
,
user
:
session_id
,
start
:
row
.get
(
0
)
})
user
:
session_id
,
start
:
row
.get
(
0
)
})
.ok
()
?
}
...
...
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