Making get_data_from_fields work
This commit is contained in:
parent
f5534a77a2
commit
22d60f5559
|
|
@ -39,12 +39,15 @@ fn initialize_database_conn(filename: Option<String>) -> Result<Connection> {
|
|||
}
|
||||
|
||||
/// Public function to get data from db
|
||||
pub fn get_data_from_fields<T>(fields: &[&str], table_name: &str) -> Result<Vec<T>>
|
||||
pub fn get_data_from_fields<T>(
|
||||
db_conn: rusqlite::Connection,
|
||||
fields: &[&str],
|
||||
table_name: &str,
|
||||
) -> Result<Vec<T>>
|
||||
where
|
||||
T: DeserializeOwned,
|
||||
{
|
||||
let gen_query = generate_query(fields, table_name);
|
||||
let db_conn = initialize_database_conn(None)?; // TODO: Add an actual connection
|
||||
let mut query_result = db_conn.prepare(&gen_query)?;
|
||||
let res = from_rows::<T>(query_result.query([])?)
|
||||
.filter_map(|s| s.ok())
|
||||
|
|
@ -59,7 +62,7 @@ mod test {
|
|||
use struct_field_names_as_array::FieldNamesAsArray;
|
||||
|
||||
use super::*;
|
||||
#[derive(FieldNamesAsArray, Deserialize)]
|
||||
#[derive(FieldNamesAsArray, Deserialize, Debug)]
|
||||
struct TestStruct {
|
||||
id: usize,
|
||||
name: String,
|
||||
|
|
@ -67,9 +70,9 @@ mod test {
|
|||
|
||||
fn set_up() -> Result<Connection> {
|
||||
let conn = initialize_database_conn(None)?;
|
||||
conn.execute("CREATE TABLE IF NOT EXISTS InnerEquipementStats (id INTEGER UNIQUE, name TEXT, PRIMARY KEY('id' AUTOINCREMENT));",())?;
|
||||
conn.execute("CREATE TABLE IF NOT EXISTS TestStruct (id INTEGER UNIQUE, name TEXT, PRIMARY KEY('id' AUTOINCREMENT));",())?;
|
||||
conn.execute(
|
||||
"INSERT INTO TestStuct (id, name) VALUES (1, 'dupont'), (2, 'durand');",
|
||||
"INSERT INTO TestStruct (id, name) VALUES (1, 'dupont'), (2, 'durand');",
|
||||
(),
|
||||
)?;
|
||||
Ok(conn)
|
||||
|
|
@ -98,9 +101,14 @@ mod test {
|
|||
#[ignore]
|
||||
#[test]
|
||||
fn test_get_data() {
|
||||
let _conn = set_up();
|
||||
let result =
|
||||
get_data_from_fields::<TestStruct>(&TestStruct::FIELD_NAMES_AS_ARRAY, "TestStruct");
|
||||
assert!(result.unwrap().is_empty())
|
||||
let _conn = set_up().unwrap();
|
||||
let result = get_data_from_fields::<TestStruct>(
|
||||
_conn,
|
||||
&TestStruct::FIELD_NAMES_AS_ARRAY,
|
||||
"TestStruct",
|
||||
)
|
||||
.unwrap();
|
||||
println!("{:?}", result);
|
||||
assert!(result.is_empty())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue