diff --git a/weaponry/src/database.rs b/weaponry/src/database.rs index a5068ef..ac67e3c 100644 --- a/weaponry/src/database.rs +++ b/weaponry/src/database.rs @@ -6,7 +6,6 @@ #![allow(dead_code)] use rusqlite::{self}; use serde::de::DeserializeOwned; -use std::collections::HashMap; /// Public function to get data from db. Returns the result as a vec with structs pub fn get_data( @@ -42,7 +41,7 @@ fn generate_select_query( /// Generate create table_name with fields as columns /// This function expects a hash map containing (column name, sqlite type) -pub fn generate_create_table_query(table_name: &str, fields: HashMap) -> String { +pub fn generate_create_table_query(table_name: &str, fields: &[(&str, &str)]) -> String { format!( "CREATE TABLE IF NOT EXISTS {} ({}, PRIMARY KEY('id' AUTOINCREMENT));", table_name, @@ -66,7 +65,9 @@ mod test { #[derive(FieldsAsSlice, Deserialize, Debug, PartialEq)] struct TestStruct { + #[INTEGER] id: usize, + #[TEXT] name: String, } /// setting up test db and table, also adding arbitrary data inside @@ -123,9 +124,11 @@ mod test { ) } - #[ignore = "todo"] #[test] fn test_generate_create_table_query() { - todo!() + let query = generate_create_table_query("TestStruct", TestStruct::attributes_slice()); + assert_eq!( + query, "CREATE TABLE IF NOT EXISTS TestStruct (id INTEGER,name TEXT, PRIMARY KEY('id' AUTOINCREMENT));".to_string() + ) } }