From 6f1b2d98fa3e2ef8cb6da66817846ba8e7f2e835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20CAMPO?= Date: Wed, 12 Feb 2025 16:58:40 +0100 Subject: [PATCH] Correcting clippy warns --- weaponry/src/database.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/weaponry/src/database.rs b/weaponry/src/database.rs index ba0e30d..6250efa 100644 --- a/weaponry/src/database.rs +++ b/weaponry/src/database.rs @@ -11,13 +11,14 @@ use crate::weaponry_structs::equipement_structs::InnerStats; use rusqlite::{self, Connection, Result, params}; use struct_field_names_as_array::FieldNamesAsArray; +/// 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_str(" "); - query.push_str(*item); - query.push_str(","); + query.push(' '); + query.push_str(item); + query.push(','); } query.pop(); query.push_str(format!(" FROM {};", table_name).as_str()); @@ -36,8 +37,11 @@ fn initialize_database_conn(filename: Option) -> Result { } } +/// Public function to get data from db pub fn get_data() -> Vec { - //let query = generate_query(&InnerStats::FIELD_NAMES_AS_ARRAY, "InnerStats"); + /* let gen_query = generate_query(&InnerStats::FIELD_NAMES_AS_ARRAY, "InnerStats"); + let db_conn = initialize_database_conn(Some("/tmp/data.sqlite3".to_owned())).unwrap(); + let mut query_result = db_conn.prepare(&gen_query);*/ todo!() } @@ -63,7 +67,7 @@ mod test { } #[test] - fn test_initialize_database() { + fn test_initialize_database_conn() { todo!() }