From 72edbd4cf0c2b3b25e2d7168b77664693fd0323e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20CAMPO?= Date: Tue, 18 Feb 2025 22:09:02 +0100 Subject: [PATCH] removing generate_select_query requierment for WHERE in filter --- weaponry/src/database.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/weaponry/src/database.rs b/weaponry/src/database.rs index 666364d..a5068ef 100644 --- a/weaponry/src/database.rs +++ b/weaponry/src/database.rs @@ -22,8 +22,7 @@ where .collect()) } -/// Generate a SELECT query with fields generated from a struct. Returns a String -/// filter MUST contain "WHERE" else the query will fail +/// Generate a SELECT query with fields generated from a struct. Returns a SQL request as a String #[inline] fn generate_select_query( table_name: &str, @@ -37,7 +36,7 @@ fn generate_select_query( .collect::>() .join(","), table_name, - filter.map_or_else(String::default, |j| " ".to_string() + j) + filter.map_or_else(String::default, |j| " WHERE ".to_string() + j) ) } @@ -96,7 +95,7 @@ mod test { "SELECT id,name FROM TestStruct;" ); assert_eq!( - generate_select_query::("TestStruct", Some("WHERE id=id")), + generate_select_query::("TestStruct", Some("id=id")), "SELECT id,name FROM TestStruct WHERE id=id;" ); }