Move skip & limit out of QueryInput, into QQueryFilter...

This commit is contained in:
2023-04-26 10:18:44 -05:00
parent caf9f102f6
commit 04a8fa94f9
21 changed files with 244 additions and 171 deletions

View File

@ -128,38 +128,31 @@ class EnumerationQueryActionTest extends BaseTest
QueryInput queryInput = new QueryInput();
queryInput.setTableName("statesEnum");
queryInput.setSkip(0);
queryInput.setLimit(null);
queryInput.setFilter(new QQueryFilter().withSkip(0).withLimit(null));
QueryOutput queryOutput = new QueryAction().execute(queryInput);
assertEquals(List.of("Missouri", "Illinois"), queryOutput.getRecords().stream().map(r -> r.getValueString("name")).toList());
queryInput.setSkip(1);
queryInput.setLimit(null);
queryInput.setFilter(new QQueryFilter().withSkip(1).withLimit(null));
queryOutput = new QueryAction().execute(queryInput);
assertEquals(List.of("Illinois"), queryOutput.getRecords().stream().map(r -> r.getValueString("name")).toList());
queryInput.setSkip(2);
queryInput.setLimit(null);
queryInput.setFilter(new QQueryFilter().withSkip(2).withLimit(null));
queryOutput = new QueryAction().execute(queryInput);
assertEquals(List.of(), queryOutput.getRecords().stream().map(r -> r.getValueString("name")).toList());
queryInput.setSkip(null);
queryInput.setLimit(1);
queryInput.setFilter(new QQueryFilter().withSkip(null).withLimit(1));
queryOutput = new QueryAction().execute(queryInput);
assertEquals(List.of("Missouri"), queryOutput.getRecords().stream().map(r -> r.getValueString("name")).toList());
queryInput.setSkip(null);
queryInput.setLimit(2);
queryInput.setFilter(new QQueryFilter().withSkip(null).withLimit(2));
queryOutput = new QueryAction().execute(queryInput);
assertEquals(List.of("Missouri", "Illinois"), queryOutput.getRecords().stream().map(r -> r.getValueString("name")).toList());
queryInput.setSkip(null);
queryInput.setLimit(3);
queryInput.setFilter(new QQueryFilter().withSkip(null).withLimit(3));
queryOutput = new QueryAction().execute(queryInput);
assertEquals(List.of("Missouri", "Illinois"), queryOutput.getRecords().stream().map(r -> r.getValueString("name")).toList());
queryInput.setSkip(null);
queryInput.setLimit(0);
queryInput.setFilter(new QQueryFilter().withSkip(null).withLimit(0));
queryOutput = new QueryAction().execute(queryInput);
assertEquals(List.of(), queryOutput.getRecords().stream().map(r -> r.getValueString("name")).toList());
}

View File

@ -341,14 +341,13 @@ class MemoryBackendModuleTest extends BaseTest
{
QueryInput queryInput = new QueryInput();
queryInput.setTableName(table.getName());
queryInput.setLimit(2);
queryInput.setFilter(new QQueryFilter().withLimit(2));
assertEquals(2, new QueryAction().execute(queryInput).getRecords().size());
queryInput.setLimit(1);
queryInput.setFilter(new QQueryFilter().withLimit(1));
assertEquals(1, new QueryAction().execute(queryInput).getRecords().size());
queryInput.setSkip(4);
queryInput.setLimit(3);
queryInput.setFilter(new QQueryFilter().withSkip(4).withLimit(3));
assertEquals(0, new QueryAction().execute(queryInput).getRecords().size());
}