langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support prop queries in filtered decks

Browse Source 
https://forums.ankiweb.net/t/phantom-overdue-reviews/30300
This commit is contained in:
Damien Elmes 2023-05-20 10:49:00 +10:00
parent 716db5ee6b
commit c520b59311
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rslib/src/search/sqlwriter.rs
View File

@ -326,8 +326,10 @@ impl SqlWriter<'_> {
self.sql, self.sql,
// SQL does integer division if both parameters are integers // SQL does integer division if both parameters are integers
"(\ "(\
(c.queue in ({rev},{daylrn}) and c.due {op} {day}) or \ (c.queue in ({rev},{daylrn}) and
(c.queue in ({lrn},{previewrepeat}) and ((c.due - {cutoff}) / 86400) {op} {days})\ (case when c.odue != 0 then c.odue else c.due end) {op} {day}) or \
(c.queue in ({lrn},{previewrepeat}) and
(((case when c.odue != 0 then c.odue else c.due end) - {cutoff}) / 86400) {op} {days})\
)", )",
rev = CardQueue::Review as u8, rev = CardQueue::Review as u8,
daylrn = CardQueue::DayLearn as u8, daylrn = CardQueue::DayLearn as u8,
@ -341,7 +343,7 @@ impl SqlWriter<'_> {
} }
PropertyKind::Position(pos) => write!( PropertyKind::Position(pos) => write!(
self.sql, self.sql,
"(c.type = {t} and due {op} {pos})", "(c.type = {t} and (case when c.odue != 0 then c.odue else c.due end) {op} {pos})",
t = CardType::New as u8, t = CardType::New as u8,
op = op, op = op,
pos = pos pos = pos
@ -1167,7 +1169,9 @@ mod test {
assert_eq!( assert_eq!(
s(ctx, "prop:due!=-1").0, s(ctx, "prop:due!=-1").0,
format!( format!(
"(((c.queue in (2,3) and c.due != {days}) or (c.queue in (1,4) and ((c.due - {cutoff}) / 86400) != -1)))", "(((c.queue in (2,3) and \n (case when \
c.odue != 0 then c.odue else c.due end) != {days}) or (c.queue in (1,4) and
(((case when c.odue != 0 then c.odue else c.due end) - {cutoff}) / 86400) != -1)))",
days = timing.days_elapsed - 1, days = timing.days_elapsed - 1,
cutoff = timing.next_day_at cutoff = timing.next_day_at
) )