upgrading to rusqlite 0.20.0. was kind of a doosy, especially with the new version of rustc i am using. the idea here is to be able to build sqlite3 with SQLITE_MAX_VARIABLE_NUMBER set to a much higher numbers than the default (999 -> 9999) so we avoid any TOO MANY VARIABLES errors. this is due to an error reported by a user that was exceedingly hard to track down.

Author: orthecreedence

Cargo.lock

@@ -46,7 +46,7 @@ protected_derive = { path = "protected_derive" }
 quick-error = "1.2.2"
 regex = "0.1.77"
 reqwest = "0.9.3"
-rusqlite = "0.13.0"
+rusqlite = "0.20.0"
 serde = "1.0.8"
 serde_derive = "1.0.8"
 serde_json = "1.0.2"

Cargo.toml

@@ -5,5 +5,5 @@ authors = ["Andrew Danger Lyon <orthecreedence@gmail.com>"]
 
 [dependencies]
 quick-error = "1.2.2"
-rusqlite = "0.13.0"
+rusqlite = "0.20.0"
 

clouseau/Cargo.toml

@@ -11,7 +11,7 @@ extern crate rusqlite;
 use ::std::error::Error;
 use ::std::mem;
 
-use ::rusqlite::Connection;
+use ::rusqlite::{Connection, NO_PARAMS};
 
 //                          ....~?=:::~M8.+$??Z$DON??=Z+,+=~.....               
 //           ...           ....~?IZO==+:=$+:+:?.$8=I.$~::+:=~....               
@@ -68,7 +68,7 @@ use ::rusqlite::Connection;
 quick_error! {
     #[derive(Debug)]
     pub enum CError {
-        Boxed(err: Box<Error + Send + Sync>) {
+        Boxed(err: Box<dyn Error + Send + Sync>) {
             description(err.description())
             display("error: {}", err)
         }
@@ -104,7 +104,7 @@ impl Clouseau {
     /// Very clever. Very clever indeed!
     pub fn new() -> CResult<Clouseau> {
         let conn = Connection::open_in_memory()?;
-        conn.execute("CREATE VIRTUAL TABLE objects USING fts4 (id VARCHAR(64) PRIMARY KEY, content TEXT)", &[])?;
+        conn.execute("CREATE VIRTUAL TABLE objects USING fts4 (id VARCHAR(64) PRIMARY KEY, content TEXT)", NO_PARAMS)?;
         Ok(Clouseau {
             conn: conn,
         })

clouseau/src/lib.rs

@@ -6,7 +6,7 @@ authors = ["Andrew Danger Lyon <orthecreedence@gmail.com>"]
 [dependencies]
 jedi = { path = "../jedi" }
 libc = "0.2.15"
-rusqlite = "0.13.0"
+rusqlite = "0.20.0"
 quick-error = "1.2.2"
 serde = "1.0.8"
 serde_json = "1.0.2"

dumpy/Cargo.toml

@@ -14,7 +14,7 @@ quick_error! {
             description(str)
             display("error: {}", str)
         }
-        Boxed(err: Box<Error + Send + Sync>) {
+        Boxed(err: Box<dyn Error + Send + Sync>) {
             description(err.description())
             display("error: {}", err.description())
         }

dumpy/src/error.rs

@@ -26,7 +26,7 @@ extern crate quick_error;
 extern crate rusqlite;
 extern crate serde_json;
 
-use ::rusqlite::Connection;
+use ::rusqlite::{Connection, NO_PARAMS};
 use ::rusqlite::types::Value as SqlValue;
 use ::rusqlite::types::{ToSql, ToSqlOutput};
 use ::rusqlite::Error as SqlError;
@@ -78,13 +78,13 @@ impl Dumpy {
 
     /// Init our dumpy store on an existing connection.
     pub fn init(&self, conn: &Connection) -> DResult<()> {
-        conn.execute("CREATE TABLE IF NOT EXISTS dumpy_objects (id VARCHAR(64) PRIMARY KEY, table_name VARCHAR(32), data TEXT)", &[])?;
-        conn.execute("CREATE TABLE IF NOT EXISTS dumpy_index (id INTEGER PRIMARY KEY, table_name VARCHAR(32), index_name VARCHAR(32), vals VARCHAR(256), object_id VARCHAR(64))", &[])?;
-        conn.execute("CREATE TABLE IF NOT EXISTS dumpy_kv (key VARCHAR(32) PRIMARY KEY, value TEXT)", &[])?;
+        conn.execute("CREATE TABLE IF NOT EXISTS dumpy_objects (id VARCHAR(64) PRIMARY KEY, table_name VARCHAR(32), data TEXT)", NO_PARAMS)?;
+        conn.execute("CREATE TABLE IF NOT EXISTS dumpy_index (id INTEGER PRIMARY KEY, table_name VARCHAR(32), index_name VARCHAR(32), vals VARCHAR(256), object_id VARCHAR(64))", NO_PARAMS)?;
+        conn.execute("CREATE TABLE IF NOT EXISTS dumpy_kv (key VARCHAR(32) PRIMARY KEY, value TEXT)", NO_PARAMS)?;
 
-        conn.execute("CREATE INDEX IF NOT EXISTS dumpy_idx_index ON dumpy_index (table_name, index_name, vals)", &[])?;
-        conn.execute("CREATE INDEX IF NOT EXISTS dumpy_idx_index_obj ON dumpy_index (table_name, object_id)", &[])?;
-        conn.execute("CREATE UNIQUE INDEX IF NOT EXISTS dumpy_idx_kv ON dumpy_kv (key)", &[])?;
+        conn.execute("CREATE INDEX IF NOT EXISTS dumpy_idx_index ON dumpy_index (table_name, index_name, vals)", NO_PARAMS)?;
+        conn.execute("CREATE INDEX IF NOT EXISTS dumpy_idx_index_obj ON dumpy_index (table_name, object_id)", NO_PARAMS)?;
+        conn.execute("CREATE UNIQUE INDEX IF NOT EXISTS dumpy_idx_kv ON dumpy_kv (key)", NO_PARAMS)?;
         Ok(())
     }
 
@@ -215,7 +215,7 @@ impl Dumpy {
     pub fn get(&self, conn: &Connection, table: &String, id: &String) -> DResult<Option<Value>> {
         let query = "SELECT data FROM dumpy_objects WHERE id = $1 AND table_name = $2";
         let res = conn.query_row_and_then(query, &[id, table], |row| -> DResult<Value> {
-            let data: SqlValue = row.get_checked("data")?;
+            let data: SqlValue = row.get("data")?;
             match data {
                 SqlValue::Text(ref x) => {
                     Ok(jedi::parse(x)?)
@@ -265,7 +265,7 @@ impl Dumpy {
         });
         let query = format!("SELECT data FROM dumpy_objects WHERE id IN ({}) ORDER BY id ASC", oids);
         let mut query = conn.prepare(&query[..])?;
-        let rows = query.query_map(&[], |row| {
+        let rows = query.query_map(NO_PARAMS, |row| {
             row.get("data")
         })?;
         let mut objects: Vec<Value> = Vec::new();
@@ -288,9 +288,9 @@ impl Dumpy {
         let merged_qry = qry_parts.as_slice().join("");
         let mut query = conn.prepare(merged_qry.as_str())?;
 
-        let values: Vec<&ToSql> = qry_vals.iter()
+        let values: Vec<&dyn ToSql> = qry_vals.iter()
             .map(|x| {
-                let ts: &ToSql = x;
+                let ts: &dyn ToSql = x;
                 ts
             })
             .collect::<Vec<_>>();
@@ -325,10 +325,10 @@ impl Dumpy {
         qry_parts.push(") ORDER BY id ASC");
         let final_query = qry_parts.as_slice().join("");
         let mut prepared_qry = conn.prepare(final_query.as_str())?;
-        let mut values: Vec<&ToSql> = Vec::with_capacity(qry_vals.len());
+        let mut values: Vec<&dyn ToSql> = Vec::with_capacity(qry_vals.len());
         for val in &qry_vals {
-            let ts: &ToSql = val;
-            values.push(ts);
+            //let ts: dyn ToSql = val;
+            values.push(val as &dyn ToSql);
         }
         let rows = prepared_qry.query_map(values.as_slice(), |row| row.get("data"))?;
         let mut objects: Vec<Value> = Vec::new();
@@ -340,15 +340,15 @@ impl Dumpy {
 
     /// Set a value into the key/val store
     pub fn kv_set(&self, conn: &Connection, key: &str, val: &String) -> DResult<()> {
-        conn.execute("INSERT OR REPLACE INTO dumpy_kv (key, value) VALUES ($1, $2)", &[&key, val])?;
+        conn.execute("INSERT OR REPLACE INTO dumpy_kv (key, value) VALUES ($1, $2)", &[&key, val.as_str()])?;
         Ok(())
     }
 
     /// Get a value from the key/val store
     pub fn kv_get(&self, conn: &Connection, key: &str) -> DResult<Option<String>> {
         let query = "SELECT value FROM dumpy_kv WHERE key = $1";
         let res = conn.query_row_and_then(query, &[&key], |row| -> DResult<String> {
-            let data: SqlValue = row.get_checked("value")?;
+            let data: SqlValue = row.get("value")?;
             match data {
                 SqlValue::Text(x) => {
                     Ok(x)
@@ -393,7 +393,7 @@ mod tests {
 
     fn index_count(conn: &Connection) -> i64 {
         conn.query_row_and_then("SELECT COUNT(*) AS count FROM dumpy_index", &[], |row| -> DResult<i64> {
-            let data: SqlValue = row.get_checked("count")?;
+            let data: SqlValue = row.get("count")?;
             match data {
                 SqlValue::Integer(ref x) => Ok(x.clone()),
                 _ => Err(DError::Msg(format!("error grabbing count"))),

dumpy/src/lib.rs

@@ -4,7 +4,7 @@ quick_error! {
     /// Define a type for cryptography errors.
     #[derive(Debug)]
     pub enum CryptoError {
-        Boxed(err: Box<Error + Send + Sync>) {
+        Boxed(err: Box<dyn Error + Send + Sync>) {
             description(err.description())
             display("crypto: error: {}", err.description())
         }