diff options
| author | Teddy Wing | 2022-03-19 15:15:25 +0100 | 
|---|---|---|
| committer | Teddy Wing | 2022-03-19 15:15:25 +0100 | 
| commit | 8b52dd67c57ed843e7d4d2d493f5bdfc4c2c214c (patch) | |
| tree | 193e3edfd49b27b1b54ad112cee22a83c786c407 | |
| parent | 02b6af5d4f34ac31733eec7fc102b519e4c32033 (diff) | |
| download | yaqlite-8b52dd67c57ed843e7d4d2d493f5bdfc4c2c214c.tar.bz2 | |
select(): Remove `unwrap()`s
| -rw-r--r-- | src/select.rs | 14 | 
1 files changed, 7 insertions, 7 deletions
| diff --git a/src/select.rs b/src/select.rs index f480fbf..1405347 100644 --- a/src/select.rs +++ b/src/select.rs @@ -13,7 +13,7 @@ pub fn select(      dbconn: &rusqlite::Connection,      table_name: &str,      record_id: &str, -) -> yaml_rust::Yaml { +) -> Result<yaml_rust::Yaml, crate::Error> {      use crate::yaml::Yaml;      let mut stmt = dbconn.prepare( @@ -27,7 +27,7 @@ pub fn select(              table_name,              "id",          ), -    ).unwrap(); +    )?;      let column_count = stmt.column_count();      // let column_names: Vec<yaml_rust::Yaml> = stmt.column_names() @@ -80,7 +80,7 @@ pub fn select(              Ok(data)          }, -    ).unwrap(); +    )?;      let mut row = None;      for row_result in rows { @@ -96,16 +96,16 @@ pub fn select(          //          // row = Some(yaml_rust::Yaml::Hash(data)); -        row = Some(yaml_rust::Yaml::Hash(row_result.unwrap())); +        row = Some(yaml_rust::Yaml::Hash(row_result?));          dbg!(&row);      }      if let Some(r) = row { -        return r; +        return Ok(r);      }      // todo!(); -    yaml_rust::Yaml::Null +    Ok(yaml_rust::Yaml::Null)  } @@ -164,7 +164,7 @@ With multiple paragraphs.".to_owned(),                  rusqlite::params![record.count, record.description],              ).unwrap(); -            let got = select(&conn, "test", "1"); +            let got = select(&conn, "test", "1").unwrap();              dbg!(&got); | 
