Skip to content

Commit ffaebeb

Browse files
committed
Remove hack for rusqlite optional()
1 parent 6ce77ea commit ffaebeb

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

database/src/pool/sqlite.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -331,14 +331,8 @@ impl Connection for SqliteConnection {
331331
cid.and_then(|cid| {
332332
query
333333
.query_row(params![&sid, &cid.0], |row| row.get(0))
334-
.optional()
335334
.unwrap_or_else(|e| {
336-
// work around https://github.com/rusqlite/rusqlite/issues/777
337-
if let rusqlite::Error::InvalidColumnType(_, _, rusqlite::types::Type::Null) = e {
338-
None
339-
} else {
340-
panic!("{:?}: series={:?}, aid={:?}", e, sid, cid);
341-
}
335+
panic!("{:?}: series={:?}, aid={:?}", e, sid, cid);
342336
})
343337
})
344338
})

0 commit comments

Comments
 (0)