GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-21 07:22:23 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

add remaining tests and fix some clippy lints

Browse source
This commit is contained in:
Damien Elmes 2020-03-20 11:02:51 +10:00
parent 8c158a3897
commit 67cb27bada
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
rslib/src/search/sqlwriter.rs
View file

@ -86,7 +86,7 @@ impl SqlWriter<'_, '_> {
fn write_unqualified(&mut self, text: &str) { fn write_unqualified(&mut self, text: &str) {
// implicitly wrap in % // implicitly wrap in %
let text = format!("%{}%", text); let text = format!("%{}%", text);
self.args.push(text.into()); self.args.push(text);
write!( write!(
self.sql, self.sql,
"(n.sfld like ?{n} escape '\\' or n.flds like ?{n} escape '\\')", "(n.sfld like ?{n} escape '\\' or n.flds like ?{n} escape '\\')",
@ -103,7 +103,7 @@ impl SqlWriter<'_, '_> {
let tag = format!("% {} %", text.replace('*', "%")); let tag = format!("% {} %", text.replace('*', "%"));
write!(self.sql, "n.tags like ?").unwrap(); write!(self.sql, "n.tags like ?").unwrap();
self.args.push(tag.into()); self.args.push(tag);
} }
fn write_rated(&mut self, days: u32, ease: Option<u8>) -> Result<()> { fn write_rated(&mut self, days: u32, ease: Option<u8>) -> Result<()> {
@ -255,7 +255,7 @@ impl SqlWriter<'_, '_> {
} }
fn write_note_type(&mut self, nt_name: &str) -> Result<()> { fn write_note_type(&mut self, nt_name: &str) -> Result<()> {
let ntids: Vec<_> = self let mut ntids: Vec<_> = self
.req .req
.storage .storage
.all_note_types()? .all_note_types()?
@ -264,6 +264,8 @@ impl SqlWriter<'_, '_> {
.map(|nt| nt.id) .map(|nt| nt.id)
.collect(); .collect();
self.sql.push_str("n.mid in "); self.sql.push_str("n.mid in ");
// sort for the benefit of unit tests
ntids.sort();
ids_to_string(&mut self.sql, &ntids); ids_to_string(&mut self.sql, &ntids);
Ok(()) Ok(())
} }
@ -288,7 +290,7 @@ impl SqlWriter<'_, '_> {
return Ok(()); return Ok(());
} }
self.args.push(val.to_string().into()); self.args.push(val.to_string());
let arg_idx = self.args.len(); let arg_idx = self.args.len();
let searches: Vec<_> = field_map let searches: Vec<_> = field_map
.iter() .iter()
@ -315,7 +317,7 @@ impl SqlWriter<'_, '_> {
ntid, csum ntid, csum
) )
.unwrap(); .unwrap();
self.args.push(text.to_string().into()) self.args.push(text.to_string());
} }
fn write_added(&mut self, days: u32) -> Result<()> { fn write_added(&mut self, days: u32) -> Result<()> {
@ -504,9 +506,23 @@ mod test {
) )
); );
// todo: // props
// note assert_eq!(s(ctx, "prop:lapses=3").0, "(lapses = 3)".to_string());
// prop assert_eq!(s(ctx, "prop:ease>=2.5").0, "(ease >= 2500)".to_string());
assert_eq!(
s(ctx, "prop:due!=-1").0,
format!(
"((c.queue in (2,3) and due != {}))",
timing.days_elapsed - 1
)
);
// note types by name
assert_eq!(&s(ctx, "note:basic").0, "(n.mid in (1581236385347))");
assert_eq!(
&s(ctx, "note:basic*").0,
"(n.mid in (1581236385345,1581236385346,1581236385347,1581236385344))"
);
Ok(()) Ok(())
}) })