Skip to content

Change SimpleTableDomainKind to use getValueSql#1462

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

Merged
labkey-martyp merged 3 commits into from
Aug 6, 2020
Merged

Change SimpleTableDomainKind to use getValueSql #1462

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82a9232
Change SimpleTableDomainKind to use getValueSql
labkey-martyp Aug 5, 2020
e881bc1
Update sql generation. Don't need raw table
labkey-martyp Aug 5, 2020
552e563
Merge branch 'develop' into fb_simpletable_getValueSql
labkey-martyp Aug 5, 2020
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
4 changes: 1 addition & 3 deletions internal/src/org/labkey/api/query/SimpleTableDomainKind.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,10 +162,8 @@ public SQLFragment sqlObjectIdsInDomain(Domain domain)
ColumnInfo objectUriColumn = table.getObjectUriColumn();
if (objectUriColumn != null)
{
TableInfo schemaTable = table.getRealTable();

SQLFragment sql = new SQLFragment();
sql.append("SELECT o.ObjectId FROM " + schemaTable + " me, exp.object o WHERE me." + objectUriColumn.getSelectName() + " = o.ObjectURI AND me.Container = ?");
sql.append("SELECT o.ObjectId FROM ").append(table.getFromSQL("me")).append(", exp.object o WHERE ").append(objectUriColumn.getValueSql("me")).append(" = o.ObjectURI AND me.Container = ?");
sql.add(domain.getContainer().getId());
return sql;
}
Expand Down