Skip to content

Drop columns that supported object-level discussions #7293

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
Open

Drop columns that supported object-level discussions #7293

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
4 changes: 0 additions & 4 deletions announcements/resources/schemas/comm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@
<column columnName="DiscussionSrcEntityType">
<description>A string representing the entity type of the discussion source.</description>
</column>
<column columnName="DiscussionSrcURL">
<description>URL to the display the object to which this message is attached. Always null for rows that are part of the default forum for the container</description>
</column>
<column columnName="LastIndexed">
<isReadOnly>true</isReadOnly>
<isUserEditable>false</isUserEditable>
Expand Down Expand Up @@ -518,7 +515,6 @@
</column>
<column columnName="LatestId"/>
<column columnName="discussionsrcidentifier"/>
<column columnName="discussionsrcurl"/>
<column columnName="ResponseCount"/>
<column columnName="Modified">
<columnTitle>Modified</columnTitle>
Expand Down
1 change: 1 addition & 0 deletions announcements/resources/schemas/dbscripts/postgresql/comm-25.002-25.003.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE comm.Announcements DROP COLUMN DiscussionSrcURL;
2 changes: 1 addition & 1 deletion 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 @@ -19,7 +19,7 @@
CREATE VIEW comm.Threads AS
SELECT threads.*, props.Title, props.AssignedTo, props.Status, props.Expires, props.CreatedBy AS ResponseCreatedBy, props.Created AS ResponseCreated FROM
(
SELECT parents.RowId, parents.EntityId, parents.Container, parents.Body, parents.RendererType, parents.DiscussionSrcIdentifier, parents.DiscussionSrcURL,
SELECT parents.RowId, parents.EntityId, parents.Container, parents.Body, parents.RendererType, parents.DiscussionSrcIdentifier,
parents.CreatedBy, parents.Created, parents.Modified, parents.LastIndexed, COALESCE(LastResponseId, RowId) AS LatestId, COALESCE(ResponseCount, 0) AS ResponseCount
FROM comm.Announcements parents LEFT OUTER JOIN
(
Expand Down
1 change: 1 addition & 0 deletions announcements/resources/schemas/dbscripts/sqlserver/comm-25.002-25.003.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE comm.Announcements DROP COLUMN DiscussionSrcURL;
2 changes: 1 addition & 1 deletion 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 @@ -19,7 +19,7 @@
CREATE VIEW comm.Threads AS
SELECT threads.*, props.Title, props.AssignedTo, props.Status, props.Expires, props.CreatedBy AS ResponseCreatedBy, props.Created AS ResponseCreated FROM
(
SELECT parents.RowId, parents.EntityId, parents.Container, parents.Body, parents.RendererType, parents.DiscussionSrcIdentifier, parents.DiscussionSrcURL,
SELECT parents.RowId, parents.EntityId, parents.Container, parents.Body, parents.RendererType, parents.DiscussionSrcIdentifier,
parents.CreatedBy, parents.Created, parents.Modified, parents.LastIndexed, COALESCE(LastResponseId, RowId) AS LatestId, COALESCE(ResponseCount, 0) AS ResponseCount
FROM comm.Announcements parents LEFT OUTER JOIN
(
Expand Down
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 @@ -93,7 +93,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 25.002;
return 25.003;
}

@Override
Expand Down
1 change: 0 additions & 1 deletion announcements/src/org/labkey/announcements/query/ThreadsTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public ThreadsTable(@NotNull AnnouncementSchema userSchema, ContainerFilter cf)
removeColumn(getColumn("Body"));
removeColumn(getColumn("RendererType"));
removeColumn(getColumn("DiscussionSrcIdentifier"));
removeColumn(getColumn("DiscussionSrcUrl"));
removeColumn(getColumn("Container"));
var folderColumn = wrapColumn("Folder", getRealTable().getColumn("Container"));
folderColumn.setFk(new ContainerForeignKey(userSchema));
Expand Down
1 change: 1 addition & 0 deletions experiment/resources/schemas/dbscripts/postgresql/exp-25.015-25.016.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE exp.List DROP COLUMN DiscussionSetting;
2 changes: 2 additions & 0 deletions experiment/resources/schemas/dbscripts/sqlserver/exp-25.015-25.016.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
EXEC core.fn_dropifexists 'List', 'exp', 'DEFAULT', 'DiscussionSetting';
ALTER TABLE exp.List DROP COLUMN DiscussionSetting;
1 change: 0 additions & 1 deletion experiment/resources/schemas/exp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@
<column columnName="TitleColumn" />
<column columnName="Description" />
<column columnName="Category"/>
<column columnName="DiscussionSetting" />
<column columnName="AllowDelete" />
<column columnName="AllowUpload" />
<column columnName="AllowExport" />
Expand Down
2 changes: 1 addition & 1 deletion experiment/src/org/labkey/experiment/ExperimentModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public String getName()
@Override
public Double getSchemaVersion()
{
return 25.015;
return 25.016;
}

@Nullable
Expand Down