diff --git a/weaponry/src/database.rs b/weaponry/src/database.rs index a9de8eb..0a3c366 100644 --- a/weaponry/src/database.rs +++ b/weaponry/src/database.rs @@ -12,29 +12,11 @@ use serde_rusqlite::*; /// Generate a SELECT query with fields generated from a struct. Returns a String fn generate_query(fields: &[&str], table_name: &str) -> String { - // let mut query = String::new(); - // query.push_str("SELECT"); - // for item in fields.iter() { - // query.push(' '); - // query.push_str(item); - // query.push(','); - // } - // query.pop(); - // query.push_str(format!(" FROM {};", table_name).as_str()); - // query format!("SELECT {} FROM {};", fields.join(", "), table_name) } /// Checks if database exists, and returns a rusqlite::Connection. If not, opens database in memory. -// TODO: Remove this cursed dual purpose function fn initialize_database_conn(filename: Option) -> Result { - // if let Some(text) = filename { - // let conn = Connection::open(text)?; - // Ok(conn) - // } else { - // let conn = Connection::open_in_memory()?; - // Ok(conn) - // } filename.map_or_else(Connection::open_in_memory, Connection::open) } @@ -57,11 +39,11 @@ where #[cfg(test)] mod test { + use super::*; use pretty_assertions::assert_eq; use serde::Deserialize; use struct_field_names_as_array::FieldNamesAsArray; - use super::*; #[derive(FieldNamesAsArray, Deserialize, Debug)] struct TestStruct { id: usize,