Skip to content

Join core.Documents rows to parent details #594

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-adam wants to merge 1 commit into
base: develop
Choose a base branch
from
+9 −2
Open

Join core.Documents rows to parent details #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions panoramapublic/src/org/labkey/panoramapublic/bluesky/PanoramaPublicLogoResourceType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,11 @@ public void addWhereSql(SQLFragment sql, String parentColumn, String documentNam
.appendStringLiteral(PanoramaPublicLogoManager.LOGO_FILE_PREFIX + "%", CoreSchema.getInstance().getSqlDialect())
.append(") ");
}

@Override
public @NotNull SQLFragment getSelectEntityIdAndDescriptionSql()
{
return new SQLFragment("SELECT EntityId, CASE WHEN Name IS NULL THEN '<Root>' ELSE Name END AS Description FROM ")
.append(CoreSchema.getInstance().getTableInfoContainers());
}
}
4 changes: 2 additions & 2 deletions panoramapublic/src/org/labkey/panoramapublic/catalog/CatalogImageAttachmentType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ private CatalogImageAttachmentType()
}

@Override
public void addWhereSql(SQLFragment sql, String parentColumn, String documentNameColumn)
public @NotNull SQLFragment getSelectEntityIdAndDescriptionSql()
{
sql.append(parentColumn).append(" IN (SELECT EntityId FROM ").append(CoreSchema.getInstance().getTableInfoShortURL(), "shorUrls").append(")");
return new SQLFragment("SELECT EntityId, ShortUrl AS Description FROM ").append(CoreSchema.getInstance().getTableInfoShortURL());
}
}