diff --git a/weaponry/src/database.rs b/weaponry/src/database.rs index bca6039..54e608f 100644 --- a/weaponry/src/database.rs +++ b/weaponry/src/database.rs @@ -30,14 +30,14 @@ fn generate_select_query( filter: Option<&str>, ) -> String { format!( - "SELECT {} FROM {} {};", + "SELECT {} FROM {}{};", T::attributes_map() .into_iter() .map(|(k, _v)| k) .collect::>() - .join(", "), + .join(","), table_name, - filter.unwrap_or("") + filter.map_or_else(String::default, |j| " ".to_string() + j) ) } @@ -70,7 +70,7 @@ mod test { id: usize, name: String, } - + /// setting up test db and table, also adding arbitrary data inside fn mock_set_up(db_filename: &str) -> EquipementDatabase { let equip_db = EquipementDatabase::new(db_filename).unwrap(); equip_db.conn.execute("CREATE TABLE IF NOT EXISTS TestStruct (id INTEGER UNIQUE, name TEXT, PRIMARY KEY('id' AUTOINCREMENT));",()).unwrap(); @@ -93,11 +93,11 @@ mod test { fn test_generate_query() { assert_eq!( generate_select_query::("TestStruct", None), - "SELECT id, name FROM TestStruct ;" + "SELECT id,name FROM TestStruct;" ); assert_eq!( generate_select_query::("TestStruct", Some("WHERE id=id")), - "SELECT id, name FROM TestStruct WHERE id=id;" + "SELECT id,name FROM TestStruct WHERE id=id;" ); }