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

Update to not setup a join context for non-table data sources

Browse Source
This commit is contained in:
darin.kelkhoff
2023-01-12 08:38:09 -06:00
parent c07a77d4a6
commit 41877a7055
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/GenerateReportAction.java
View File

@ -224,7 +224,11 @@ public class GenerateReportAction
exportInput.setIncludeHeaderRow(reportView.getIncludeHeaderRow()); exportInput.setIncludeHeaderRow(reportView.getIncludeHeaderRow());
exportInput.setReportOutputStream(reportInput.getReportOutputStream()); exportInput.setReportOutputStream(reportInput.getReportOutputStream());
JoinsContext joinsContext = new JoinsContext(exportInput.getInstance(), dataSource.getSourceTable(), dataSource.getQueryJoins()); JoinsContext joinsContext = null;
if(StringUtils.hasContent(dataSource.getSourceTable()))
{
joinsContext = new JoinsContext(exportInput.getInstance(), dataSource.getSourceTable(), dataSource.getQueryJoins());
}
List<QFieldMetaData> fields = new ArrayList<>(); List<QFieldMetaData> fields = new ArrayList<>();
for(QReportField column : reportView.getColumns()) for(QReportField column : reportView.getColumns())
@ -236,10 +240,10 @@ public class GenerateReportAction
else else
{ {
String effectiveFieldName = Objects.requireNonNullElse(column.getSourceFieldName(), column.getName()); String effectiveFieldName = Objects.requireNonNullElse(column.getSourceFieldName(), column.getName());
JoinsContext.FieldAndTableNameOrAlias fieldAndTableNameOrAlias = joinsContext.getFieldAndTableNameOrAlias(effectiveFieldName); JoinsContext.FieldAndTableNameOrAlias fieldAndTableNameOrAlias = joinsContext == null ? null : joinsContext.getFieldAndTableNameOrAlias(effectiveFieldName);
if(fieldAndTableNameOrAlias.field() == null) if(fieldAndTableNameOrAlias == null || fieldAndTableNameOrAlias.field() == null)
{ {
throw new QReportingException("Could not find field named [" + effectiveFieldName + "] on table [" + table.getName() + "]"); throw new QReportingException("Could not find field named [" + effectiveFieldName + "] in dataSource [" + dataSource.getName() + "]");
} }
QFieldMetaData field = fieldAndTableNameOrAlias.field().clone(); QFieldMetaData field = fieldAndTableNameOrAlias.field().clone();