correcting generate_select_query additional blank space and its associated tests
This commit is contained in:
parent
cef4741a0f
commit
433054dd7e
|
|
@ -30,14 +30,14 @@ fn generate_select_query<T: more_fields::FieldsAsMap>(
|
|||
filter: Option<&str>,
|
||||
) -> String {
|
||||
format!(
|
||||
"SELECT {} FROM {} {};",
|
||||
"SELECT {} FROM {}{};",
|
||||
T::attributes_map()
|
||||
.into_iter()
|
||||
.map(|(k, _v)| k)
|
||||
.collect::<Vec<_>>()
|
||||
.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>("TestStruct", None),
|
||||
"SELECT id, name FROM TestStruct ;"
|
||||
"SELECT id,name FROM TestStruct;"
|
||||
);
|
||||
assert_eq!(
|
||||
generate_select_query::<TestStruct>("TestStruct", Some("WHERE id=id")),
|
||||
"SELECT id, name FROM TestStruct WHERE id=id;"
|
||||
"SELECT id,name FROM TestStruct WHERE id=id;"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue