QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 05:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/CTLE-207-query-joins' into integration/sprint-25

Browse Source 
# Conflicts:
#	qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QueryInput.java
#	qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/javalin/QJavalinApiHandler.java
This commit is contained in:
darin.kelkhoff
2023-05-02 07:52:15 -05:00
parent 476924b030 1a8ab34fe3
commit f290cdeb6d
56 changed files with 2443 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java
View File

@ -228,10 +228,12 @@ public class BaseAPIActionUtil
*******************************************************************************/
public QueryOutput doQuery(QTableMetaData table, QueryInput queryInput) throws QException
{
QueryOutput queryOutput = new QueryOutput(queryInput);
Integer originalLimit = queryInput.getLimit();
Integer limit = originalLimit;
Integer skip = queryInput.getSkip();
QueryOutput queryOutput = new QueryOutput(queryInput);
QQueryFilter filter = queryInput.getFilter();
Integer originalLimit = filter == null ? null : filter.getLimit();
Integer limit = originalLimit;
Integer skip = filter == null ? null : filter.getSkip();
if(limit == null)
{
@ -243,10 +245,9 @@ public class BaseAPIActionUtil
{
try
{
QQueryFilter filter = queryInput.getFilter();
String paramString = buildQueryStringForGet(filter, limit, skip, table.getFields());
String url = buildTableUrl(table) + paramString;
HttpGet request = new HttpGet(url);
String paramString = buildQueryStringForGet(filter, limit, skip, table.getFields());
String url = buildTableUrl(table) + paramString;
HttpGet request = new HttpGet(url);
QHttpResponse response = makeRequest(table, request);
int count = processGetResponse(table, response, queryOutput);