Skip to content

Commit d29efa7

Browse files
authored
Drop columns that supported object-level discussions (#7293)
1 parent 7ba61f7 commit d29efa7

11 files changed

Lines changed: 9 additions & 10 deletions

File tree

announcements/resources/schemas/comm.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@
121121
<column columnName="DiscussionSrcEntityType">
122122
<description>A string representing the entity type of the discussion source.</description>
123123
</column>
124-
<column columnName="DiscussionSrcURL">
125-
<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>
126-
</column>
127124
<column columnName="LastIndexed">
128125
<isReadOnly>true</isReadOnly>
129126
<isUserEditable>false</isUserEditable>
@@ -518,7 +515,6 @@
518515
</column>
519516
<column columnName="LatestId"/>
520517
<column columnName="discussionsrcidentifier"/>
521-
<column columnName="discussionsrcurl"/>
522518
<column columnName="ResponseCount"/>
523519
<column columnName="Modified">
524520
<columnTitle>Modified</columnTitle>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE comm.Announcements DROP COLUMN DiscussionSrcURL;

announcements/resources/schemas/dbscripts/postgresql/comm-create.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
CREATE VIEW comm.Threads AS
2020
SELECT threads.*, props.Title, props.AssignedTo, props.Status, props.Expires, props.CreatedBy AS ResponseCreatedBy, props.Created AS ResponseCreated FROM
2121
(
22-
SELECT parents.RowId, parents.EntityId, parents.Container, parents.Body, parents.RendererType, parents.DiscussionSrcIdentifier, parents.DiscussionSrcURL,
22+
SELECT parents.RowId, parents.EntityId, parents.Container, parents.Body, parents.RendererType, parents.DiscussionSrcIdentifier,
2323
parents.CreatedBy, parents.Created, parents.Modified, parents.LastIndexed, COALESCE(LastResponseId, RowId) AS LatestId, COALESCE(ResponseCount, 0) AS ResponseCount
2424
FROM comm.Announcements parents LEFT OUTER JOIN
2525
(
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE comm.Announcements DROP COLUMN DiscussionSrcURL;

announcements/resources/schemas/dbscripts/sqlserver/comm-create.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
CREATE VIEW comm.Threads AS
2020
SELECT threads.*, props.Title, props.AssignedTo, props.Status, props.Expires, props.CreatedBy AS ResponseCreatedBy, props.Created AS ResponseCreated FROM
2121
(
22-
SELECT parents.RowId, parents.EntityId, parents.Container, parents.Body, parents.RendererType, parents.DiscussionSrcIdentifier, parents.DiscussionSrcURL,
22+
SELECT parents.RowId, parents.EntityId, parents.Container, parents.Body, parents.RendererType, parents.DiscussionSrcIdentifier,
2323
parents.CreatedBy, parents.Created, parents.Modified, parents.LastIndexed, COALESCE(LastResponseId, RowId) AS LatestId, COALESCE(ResponseCount, 0) AS ResponseCount
2424
FROM comm.Announcements parents LEFT OUTER JOIN
2525
(

announcements/src/org/labkey/announcements/AnnouncementModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public String getName()
9393
@Override
9494
public @Nullable Double getSchemaVersion()
9595
{
96-
return 25.002;
96+
return 25.003;
9797
}
9898

9999
@Override

announcements/src/org/labkey/announcements/query/ThreadsTable.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public ThreadsTable(@NotNull AnnouncementSchema userSchema, ContainerFilter cf)
3333
removeColumn(getColumn("Body"));
3434
removeColumn(getColumn("RendererType"));
3535
removeColumn(getColumn("DiscussionSrcIdentifier"));
36-
removeColumn(getColumn("DiscussionSrcUrl"));
3736
removeColumn(getColumn("Container"));
3837
var folderColumn = wrapColumn("Folder", getRealTable().getColumn("Container"));
3938
folderColumn.setFk(new ContainerForeignKey(userSchema));
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE exp.List DROP COLUMN DiscussionSetting;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
EXEC core.fn_dropifexists 'List', 'exp', 'DEFAULT', 'DiscussionSetting';
2+
ALTER TABLE exp.List DROP COLUMN DiscussionSetting;

experiment/resources/schemas/exp.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@
233233
<column columnName="TitleColumn" />
234234
<column columnName="Description" />
235235
<column columnName="Category"/>
236-
<column columnName="DiscussionSetting" />
237236
<column columnName="AllowDelete" />
238237
<column columnName="AllowUpload" />
239238
<column columnName="AllowExport" />

0 commit comments

Comments
 (0)