From ffaebeb22748ea63fb6011c359e6ea3e9f505d14 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Mon, 29 Jun 2020 20:45:50 -0400 Subject: [PATCH] Remove hack for rusqlite optional() --- database/src/pool/sqlite.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/database/src/pool/sqlite.rs b/database/src/pool/sqlite.rs index ab0558cd5..edffb8686 100644 --- a/database/src/pool/sqlite.rs +++ b/database/src/pool/sqlite.rs @@ -331,14 +331,8 @@ impl Connection for SqliteConnection { cid.and_then(|cid| { query .query_row(params![&sid, &cid.0], |row| row.get(0)) - .optional() .unwrap_or_else(|e| { - // work around https://github.com/rusqlite/rusqlite/issues/777 - if let rusqlite::Error::InvalidColumnType(_, _, rusqlite::types::Type::Null) = e { - None - } else { - panic!("{:?}: series={:?}, aid={:?}", e, sid, cid); - } + panic!("{:?}: series={:?}, aid={:?}", e, sid, cid); }) }) })