MensBeam/Arsse
3
1
Fork 0
Code Issues 24 Pull requests Releases 28 Activity

Tests for selecting arrays of ranges

Browse source
This commit is contained in:
J. King 2022-04-25 14:33:19 -04:00
parent e6505a5fda
commit 7e5d8494c4
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Database.php
View file

@ -1725,7 +1725,7 @@ class Database {
$w[] = "{$colDefs[$col]} <= ?"; $w[] = "{$colDefs[$col]} <= ?";
$t[] = $type; $t[] = $type;
$v[] = $r[1]; $v[] = $r[1];
} elseif ($context->$m[1] === null) { } elseif ($r[1] === null) {
// range is open at the high end // range is open at the high end
$w[] = "{$colDefs[$col]} >= ?"; $w[] = "{$colDefs[$col]} >= ?";
$t[] = $type; $t[] = $type;

11
tests/cases/Database/SeriesArticle.php
View file

@ -530,6 +530,14 @@ trait SeriesArticle {
'Excluding multiple folder trees including root' => [(new Context)->not->folders([0,1,5]), []], 'Excluding multiple folder trees including root' => [(new Context)->not->folders([0,1,5]), []],
'Before article 3' => [(new Context)->not->articleRange(3, null), [1,2]], 'Before article 3' => [(new Context)->not->articleRange(3, null), [1,2]],
'Before article 19' => [(new Context)->not->articleRange(null, 19), [20]], 'Before article 19' => [(new Context)->not->articleRange(null, 19), [20]],
'Marked or labelled in 2010 or 2015' => [(new Context)->markedRanges([["2010-01-01T00:00:00Z", "2010-12-31T23:59:59Z"], ["2015-01-01T00:00:00Z", "2015-12-31T23:59:59Z"]]), [2,4,6,8,20]],
'Not marked or labelled in 2010 or 2015' => [(new Context)->not->markedRanges([["2010-01-01T00:00:00Z", "2010-12-31T23:59:59Z"], ["2015-01-01T00:00:00Z", "2015-12-31T23:59:59Z"]]), [1,3,5,7,19]],
'Marked or labelled prior to 2010 or since 2015' => [(new Context)->markedRanges([[null, "2009-12-31T23:59:59Z"], ["2015-01-01T00:00:00Z", null]]), [1,3,5,7,8,19]],
'Not marked or labelled prior to 2010 or since 2015' => [(new Context)->not->markedRanges([[null, "2009-12-31T23:59:59Z"], ["2015-01-01T00:00:00Z", null]]), [2,4,6,20]],
'Modified in 2010 or 2015' => [(new Context)->modifiedRanges([["2010-01-01T00:00:00Z", "2010-12-31T23:59:59Z"], ["2015-01-01T00:00:00Z", "2015-12-31T23:59:59Z"]]), [2,4,6,8,20]],
'Not modified in 2010 or 2015' => [(new Context)->not->modifiedRanges([["2010-01-01T00:00:00Z", "2010-12-31T23:59:59Z"], ["2015-01-01T00:00:00Z", "2015-12-31T23:59:59Z"]]), [1,3,5,7,19]],
'Modified prior to 2010 or since 2015' => [(new Context)->modifiedRanges([[null, "2009-12-31T23:59:59Z"], ["2015-01-01T00:00:00Z", null]]), [1,3,5,7,19]],
'Not modified prior to 2010 or since 2015' => [(new Context)->not->modifiedRanges([[null, "2009-12-31T23:59:59Z"], ["2015-01-01T00:00:00Z", null]]), [2,4,6,8,20]],
]; ];
} }
@ -1039,9 +1047,10 @@ trait SeriesArticle {
public function provideArrayContextOptions(): iterable { public function provideArrayContextOptions(): iterable {
foreach ([ foreach ([
"articles", "editions", "articles", "editions",
"subscriptions", "foldersShallow", //"folders", "subscriptions", "foldersShallow", "folders",
"tags", "tagNames", "labels", "labelNames", "tags", "tagNames", "labels", "labelNames",
"searchTerms", "authorTerms", "annotationTerms", "searchTerms", "authorTerms", "annotationTerms",
"modifiedRanges", "markedRanges",
] as $method) { ] as $method) {
yield [$method]; yield [$method];
} }