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

in getSqlWhereStringAndPopulateParamsList... - skip a criteria with null fieldName or operator - and then if there were no valid criteria, return 1=1

Browse Source
This commit is contained in:
darin.kelkhoff
2023-09-27 13:54:05 -05:00
parent 635807c525
commit 34a1cd80f4
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/AbstractRDBMSAction.java
View File

@ -399,6 +399,18 @@ public abstract class AbstractRDBMSAction implements QActionInterface
List<String> clauses = new ArrayList<>(); List<String> clauses = new ArrayList<>();
for(QFilterCriteria criterion : criteria) for(QFilterCriteria criterion : criteria)
{ {
if(criterion.getFieldName() == null)
{
LOG.info("QFilter criteria is missing a fieldName - will not be included in query.");
continue;
}
if(criterion.getOperator() == null)
{
LOG.info("QFilter criteria is missing a operator - will not be included in query.", logPair("fieldName", criterion.getFieldName()));
continue;
}
JoinsContext.FieldAndTableNameOrAlias fieldAndTableNameOrAlias = joinsContext.getFieldAndTableNameOrAlias(criterion.getFieldName()); JoinsContext.FieldAndTableNameOrAlias fieldAndTableNameOrAlias = joinsContext.getFieldAndTableNameOrAlias(criterion.getFieldName());
List<Serializable> values = criterion.getValues() == null ? new ArrayList<>() : new ArrayList<>(criterion.getValues()); List<Serializable> values = criterion.getValues() == null ? new ArrayList<>() : new ArrayList<>(criterion.getValues());
@ -628,6 +640,16 @@ public abstract class AbstractRDBMSAction implements QActionInterface
params.addAll(values); params.addAll(values);
} }
//////////////////////////////////////////////////////////////////////////////
// since we're skipping criteria w/o a field or operator in the loop - //
// we can get to the end here without any clauses... so, return a 1=1 then, //
// as whoever called this is probably already written a WHERE or AND //
//////////////////////////////////////////////////////////////////////////////
if(clauses.isEmpty())
{
return ("1 = 1");
}
return (String.join(" " + booleanOperator.toString() + " ", clauses)); return (String.join(" " + booleanOperator.toString() + " ", clauses));
} }