admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-02-11 23:55:49 +00:00
parent ddbc8d5471
commit d71de81dd9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/AyaNova/DataList/DataListFetcher.cs
View File

@@ -74,15 +74,16 @@ namespace AyaNova.DataList
var qFrom = DataList.SQLFrom; var qFrom = DataList.SQLFrom;
//FILTERED? //FILTERED?
DataListFilter TheFilter = null; bool HasFilter = !string.IsNullOrWhiteSpace(listOptions.FilterJson);
bool HasSort = !string.IsNullOrWhiteSpace(listOptions.SortJson);
var qWhere = string.Empty; var qWhere = string.Empty;
var qOrderBy = string.Empty; var qOrderBy = string.Empty;
if (!string.IsNullOrWhiteSpace(listOptions.FilterJson)) if (HasFilter)
{ {
//WHERE CLAUSE - FILTER //WHERE CLAUSE - FILTER
qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, listOptions.FilterJson, DataList.FieldDefinitions, UserId); qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, listOptions.FilterJson, DataList.FieldDefinitions, UserId);
} }
if (!string.IsNullOrWhiteSpace(listOptions.SortJson)) if (HasSort)
{ {
//ORDER BY CLAUSE - SORT //ORDER BY CLAUSE - SORT
//BUILD ORDER BY //BUILD ORDER BY
@@ -102,7 +103,7 @@ namespace AyaNova.DataList
//PUT IT ALL TOGETHER //PUT IT ALL TOGETHER
string qDataQuery = string.Empty; string qDataQuery = string.Empty;
string qTotalRecordsQuery = string.Empty; string qTotalRecordsQuery = string.Empty;
if (TheFilter != null) if (HasFilter)
{ {
qDataQuery = $"{qSelectColumns} {qFrom} {qWhere} {qOrderBy} {qLimitOffset}"; qDataQuery = $"{qSelectColumns} {qFrom} {qWhere} {qOrderBy} {qLimitOffset}";
qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom} {qWhere}"; qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom} {qWhere}";