From f4002f34f41d6eee42de5d207c0e386e999b2e8e Mon Sep 17 00:00:00 2001
From: Conrad Dean <conrad.p.dean@gmail.com>
Date: Mon, 22 Jul 2019 08:54:51 -0400
Subject: [PATCH] fix empty param type inference with macro and update for
 rusqlite Result api

---
 transaction/src/lib.rs   |  6 +++---
 transaction/src/query.rs | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/transaction/src/lib.rs b/transaction/src/lib.rs
index 73b90d2d..c5b3bf37 100644
--- a/transaction/src/lib.rs
+++ b/transaction/src/lib.rs
@@ -322,17 +322,17 @@ impl<'a, 'c> InProgress<'a, 'c> {
     }
 
     pub fn savepoint(&self, name: &str) -> Result<()> {
-        self.transaction.execute(&format!("SAVEPOINT {}", name), &[])?;
+        self.transaction.execute(&format!("SAVEPOINT {}", name), rusqlite::params![])?;
         Ok(())
     }
 
     pub fn rollback_savepoint(&self, name: &str) -> Result<()> {
-        self.transaction.execute(&format!("ROLLBACK TO {}", name), &[])?;
+        self.transaction.execute(&format!("ROLLBACK TO {}", name), rusqlite::params![])?;
         Ok(())
     }
 
     pub fn release_savepoint(&self, name: &str) -> Result<()> {
-        self.transaction.execute(&format!("RELEASE {}", name), &[])?;
+        self.transaction.execute(&format!("RELEASE {}", name), rusqlite::params![])?;
         Ok(())
     }
 }
diff --git a/transaction/src/query.rs b/transaction/src/query.rs
index 9ccfef12..79026d06 100644
--- a/transaction/src/query.rs
+++ b/transaction/src/query.rs
@@ -292,7 +292,7 @@ fn run_statement<'sqlite, 'stmt, 'bound>
  bindings: &'bound [(String, Rc<rusqlite::types::Value>)]) -> Result<rusqlite::Rows<'stmt>> {
 
     let rows = if bindings.is_empty() {
-        statement.query(&[])?
+        statement.query(rusqlite::params![])?
     } else {
         let refs: Vec<(&str, &ToSql)> =
             bindings.iter()
@@ -313,8 +313,8 @@ fn run_sql_query<'sqlite, 'sql, 'bound, T, F>
     let mut statement = sqlite.prepare(sql)?;
     let mut rows = run_statement(&mut statement, &bindings)?;
     let mut result = vec![];
-    while let Some(row_or_error) = rows.next() {
-        result.push(mapper(&row_or_error?));
+    while let Some(row_or_error) = rows.next().unwrap() {
+        result.push(mapper(&row_or_error));
     }
     Ok(result)
 }
@@ -453,10 +453,10 @@ pub fn q_explain<'sqlite, 'query, T>
 
             let steps = run_sql_query(sqlite, &plan_sql, &query.args, |row| {
                 QueryPlanStep {
-                    select_id: row.get(0),
-                    order: row.get(1),
-                    from: row.get(2),
-                    detail: row.get(3)
+                    select_id: row.get(0).unwrap(),
+                    order: row.get(1).unwrap(),
+                    from: row.get(2).unwrap(),
+                    detail: row.get(3).unwrap()
                 }
             })?;