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

@ -531,7 +531,6 @@ public class QPicoCliImplementation
{
QueryInput queryInput = new QueryInput();
queryInput.setTableName(tableName);
queryInput.setSkip(subParseResult.matchedOptionValue("skip", null));
// todo - think about these (e.g., based on user's requested output format?
// queryInput.setShouldGenerateDisplayValues(true);
@ -553,6 +552,8 @@ public class QPicoCliImplementation
.withValues(List.of(primaryKeyValue)));
queryInput.setFilter(filter);
filter.setSkip(subParseResult.matchedOptionValue("skip", null));
QueryAction queryAction = new QueryAction();
QueryOutput queryOutput = queryAction.execute(queryInput);
List<QRecord> records = queryOutput.getRecords();
@ -577,9 +578,9 @@ public class QPicoCliImplementation
{
QueryInput queryInput = new QueryInput();
queryInput.setTableName(tableName);
queryInput.setSkip(subParseResult.matchedOptionValue("skip", null));
queryInput.setLimit(subParseResult.matchedOptionValue("limit", null));
queryInput.setFilter(generateQueryFilter(subParseResult));
queryInput.getFilter().setSkip(subParseResult.matchedOptionValue("skip", null));
queryInput.getFilter().setLimit(subParseResult.matchedOptionValue("limit", null));
// todo - think about these (e.g., based on user's requested output format?
// queryInput.setShouldGenerateDisplayValues(true);