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

@ -913,6 +913,8 @@ public class QJavalinApiHandler
PermissionsHelper.checkTablePermissionThrowing(queryInput, TablePermissionSubType.READ);
filter = new QQueryFilter();
Integer pageSize = 50;
if(StringUtils.hasContent(context.queryParam("pageSize")))
{
@ -947,12 +949,11 @@ public class QJavalinApiHandler
badRequestMessages.add("pageNo must be greater than 0.");
}
queryInput.setLimit(pageSize);
queryInput.setSkip((pageNo - 1) * pageSize);
filter.setLimit(pageSize);
filter.setSkip((pageNo - 1) * pageSize);
// queryInput.setQueryJoins(processQueryJoinsParam(context));
filter = new QQueryFilter();
if("and".equalsIgnoreCase(context.queryParam("booleanOperator")))
{
filter.setBooleanOperator(QQueryFilter.BooleanOperator.AND);