Skip to content

Optimize StorageTerminalLocation and related columns #8003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-jeckels wants to merge 2 commits into
base: release26.7-SNAPSHOT
Choose a base branch
from
Open

Optimize StorageTerminalLocation and related columns #8003

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b97097b
Optimize StorageTerminalLocation and related columns
labkey-jeckels Sep 1, 2026
a6282c5
Merge branch 'release26.7-SNAPSHOT' into 26.7_fb_joinInventory
labkey-jeckels Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions query/src/org/labkey/query/sql/CalculatedExpressionColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,22 @@ public Set<FieldKey> getReferencedFieldKeys()
return Collections.unmodifiableSet(_allFieldKeys);
}

/* getValueSql() inlines the value SQL of every column the expression references, so any join those columns
* declare has to be declared here too -- otherwise the inlined SQL names a table alias that is not in the FROM.
* Lookups and self-reference are rejected during binding, so every referenced key is a plain column on this table.
*/
@Override
public void declareJoins(String parentAlias, Map<String, SQLFragment> map)
{
getBoundExpression(); // populates _allFieldKeys
for (FieldKey key : getReferencedFieldKeys())
{
ColumnInfo col = getParentTable().getColumn(key);
if (null != col && col != this)
col.declareJoins(parentAlias, map);
}
}

public void computeMetaData(Map<FieldKey,ColumnInfo> columns)
{
if (null == columns)
Expand Down