Skip to content

Expose EntityId columns wiki queries #7302

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-jeckels merged 1 commit into from
Jan 2, 2026
+7 −5
Merged

Expose EntityId columns wiki queries #7302

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
2 changes: 2 additions & 0 deletions announcements/resources/schemas/comm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@
<formatString>DateTime</formatString>
</column>
<column columnName="Body"/>
<column columnName="EntityId"/>
</columns>
</table>
<table tableName="AllWikiVersions" tableDbType="VIEW" useColumnOrder="true">
Expand Down Expand Up @@ -450,6 +451,7 @@
<formatString>DateTime</formatString>
</column>
<column columnName="Body"/>
<column columnName="EntityId"/>
</columns>
</table>
<table tableName="UserList" tableDbType="TABLE">
Expand Down
4 changes: 2 additions & 2 deletions announcements/resources/schemas/dbscripts/postgresql/comm-create.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ CREATE VIEW comm.PagePaths AS

-- View that joins each wiki with its current version (one row per wiki)
CREATE VIEW comm.CurrentWikiVersions AS
SELECT pv.RowId, p.Container, p.Name, p.Path, p.PathParts, p.Depth, pv.Title, pv.Version, pv.Body, pv.RendererType, p.CreatedBy, p.Created, p.ModifiedBy, p.Modified
SELECT pv.RowId, p.EntityId, p.Container, p.Name, p.Path, p.PathParts, p.Depth, pv.Title, pv.Version, pv.Body, pv.RendererType, p.CreatedBy, p.Created, p.ModifiedBy, p.Modified
FROM comm.PagePaths p INNER JOIN comm.PageVersions pv ON p.PageVersionId = pv.RowId;

-- View that joins every wiki version with its parent (one row per wiki version). Report the wiki's Created & CreatedBy,
-- but map the version's Created & CreatedBy to Modified & ModifiedBy, because that seems like the most useful mapping.
CREATE VIEW comm.AllWikiVersions AS
SELECT pv.RowId, p.Container, p.Name, p.Path, p.PathParts, p.Depth, pv.Title, pv.Version, pv.Body, pv.RendererType, p.CreatedBy, p.Created, pv.CreatedBy AS ModifiedBy, pv.Created AS Modified
SELECT pv.RowId, p.EntityId, p.Container, p.Name, p.Path, p.PathParts, p.Depth, pv.Title, pv.Version, pv.Body, pv.RendererType, p.CreatedBy, p.Created, pv.CreatedBy AS ModifiedBy, pv.Created AS Modified
FROM comm.PageVersions pv INNER JOIN comm.PagePaths p ON pv.PageEntityId = p.EntityId;
4 changes: 2 additions & 2 deletions announcements/resources/schemas/dbscripts/sqlserver/comm-create.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ GO

-- View that joins each wiki with its current version (one row per wiki)
CREATE VIEW comm.CurrentWikiVersions AS
SELECT pv.RowId, p.Container, p.Name, p.Path, p.PathParts, p.Depth, pv.Title, pv.Version, pv.Body, pv.RendererType, p.CreatedBy, p.Created, p.ModifiedBy, p.Modified
SELECT pv.RowId, p.EntityId, p.Container, p.Name, p.Path, p.PathParts, p.Depth, pv.Title, pv.Version, pv.Body, pv.RendererType, p.CreatedBy, p.Created, p.ModifiedBy, p.Modified
FROM comm.PagePaths p INNER JOIN comm.PageVersions pv ON p.PageVersionId = pv.RowId;

GO

-- View that joins every wiki version with its parent (one row per wiki version). Report the wiki's Created & CreatedBy,
-- but map the version's Created & CreatedBy to Modified & ModifiedBy, because that seems like the most useful mapping.
CREATE VIEW comm.AllWikiVersions AS
SELECT pv.RowId, p.Container, p.Name, p.Path, p.PathParts, p.Depth, pv.Title, pv.Version, pv.Body, pv.RendererType, p.CreatedBy, p.Created, pv.CreatedBy AS ModifiedBy, pv.Created AS Modified
SELECT pv.RowId, p.EntityId, p.Container, p.Name, p.Path, p.PathParts, p.Depth, pv.Title, pv.Version, pv.Body, pv.RendererType, p.CreatedBy, p.Created, pv.CreatedBy AS ModifiedBy, pv.Created AS Modified
FROM comm.PageVersions pv INNER JOIN comm.PagePaths p ON pv.PageEntityId = p.EntityId;

GO
2 changes: 1 addition & 1 deletion announcements/src/org/labkey/announcements/AnnouncementModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 26.000;
return 26.001;
}

@Override
Expand Down