@@ -14,7 +14,6 @@ use domain::releases::Release;
14
14
use error:: DashResult ;
15
15
16
16
pub mod nag;
17
- mod teams;
18
17
19
18
pub type EpochTimestamp = i64 ;
20
19
@@ -229,32 +228,27 @@ pub fn open_prs_avg_days_old() -> DashResult<f64> {
229
228
let conn = try!( DB_POOL . get ( ) ) ;
230
229
Ok ( try!( pullrequest. select ( sql :: < Double > ( "AVG(EXTRACT(EPOCH FROM (now() - created_at))) / \
231
230
(60 * 60 * 24)") )
232
- . filter ( closed_at. is_null ( ) )
233
- . first ( & * conn) ) )
231
+ . filter ( closed_at. is_null ( ) )
232
+ . first ( & * conn) ) )
234
233
}
235
234
236
235
pub fn bors_retries_last_week ( ) -> DashResult < Vec < BorsRetry > > {
237
236
let conn = try!( DB_POOL . get ( ) ) ;
238
237
239
238
// waiting on associations to get this into proper typed queries
240
239
241
- Ok ( try!( select ( sql :: < ( VarChar , Integer , Integer , VarChar , Bool ) > ( "i.repository, i.number, \
242
- ic.id, i.title, \
243
- pr.merged_at IS NOT NULL
244
- \
245
- FROM issuecomment ic, \
246
- issue i, pullrequest pr \
247
- WHERE ic.body LIKE \
248
- '%@bors%retry%' AND i.id \
249
- = ic.fk_issue AND \
250
- i.is_pull_request AND \
251
- ic.created_at > NOW() - \
252
- '7 days'::interval AND \
253
- pr.repository = \
254
- i.repository AND \
255
- pr.number = i.number \
256
- ORDER BY ic.created_at \
257
- DESC") )
240
+ Ok ( try!( select (
241
+ sql :: < ( VarChar , Integer , Integer , VarChar , Bool ) > (
242
+ "i.repository, i.number, ic.id, i.title, pr.merged_at IS NOT NULL \
243
+ FROM issuecomment ic, issue i, pullrequest pr \
244
+ WHERE \
245
+ ic.body LIKE '%@bors%retry%' AND \
246
+ i.id = ic.fk_issue AND \
247
+ i.is_pull_request AND \
248
+ ic.created_at > NOW() - '7 days'::interval AND \
249
+ pr.repository = i.repository AND \
250
+ pr.number = i.number \
251
+ ORDER BY ic.created_at DESC") )
258
252
. load ( & * conn) ) )
259
253
}
260
254
@@ -333,8 +327,8 @@ pub fn open_issues_avg_days_old() -> DashResult<f64> {
333
327
let conn = try!( DB_POOL . get ( ) ) ;
334
328
Ok ( try!( issue. select ( sql :: < Double > ( "AVG(EXTRACT(EPOCH FROM (now() - created_at))) / \
335
329
(60 * 60 * 24)") )
336
- . filter ( closed_at. is_null ( ) )
337
- . first ( & * conn) ) )
330
+ . filter ( closed_at. is_null ( ) )
331
+ . first ( & * conn) ) )
338
332
}
339
333
340
334
pub fn open_issues_with_label ( label : & str ) -> DashResult < i64 > {
0 commit comments