diff --git a/announcements/resources/schemas/comm.xml b/announcements/resources/schemas/comm.xml index 6fcc82da6b4..10d3f3df6a3 100644 --- a/announcements/resources/schemas/comm.xml +++ b/announcements/resources/schemas/comm.xml @@ -121,9 +121,6 @@ A string representing the entity type of the discussion source. - - 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 - true false @@ -518,7 +515,6 @@ - Modified diff --git a/announcements/resources/schemas/dbscripts/postgresql/comm-25.002-25.003.sql b/announcements/resources/schemas/dbscripts/postgresql/comm-25.002-25.003.sql new file mode 100644 index 00000000000..d78c5d7b744 --- /dev/null +++ b/announcements/resources/schemas/dbscripts/postgresql/comm-25.002-25.003.sql @@ -0,0 +1 @@ +ALTER TABLE comm.Announcements DROP COLUMN DiscussionSrcURL; diff --git a/announcements/resources/schemas/dbscripts/postgresql/comm-create.sql b/announcements/resources/schemas/dbscripts/postgresql/comm-create.sql index a6c8a6b18bb..1c83fce6047 100644 --- a/announcements/resources/schemas/dbscripts/postgresql/comm-create.sql +++ b/announcements/resources/schemas/dbscripts/postgresql/comm-create.sql @@ -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 ( diff --git a/announcements/resources/schemas/dbscripts/sqlserver/comm-25.002-25.003.sql b/announcements/resources/schemas/dbscripts/sqlserver/comm-25.002-25.003.sql new file mode 100644 index 00000000000..d78c5d7b744 --- /dev/null +++ b/announcements/resources/schemas/dbscripts/sqlserver/comm-25.002-25.003.sql @@ -0,0 +1 @@ +ALTER TABLE comm.Announcements DROP COLUMN DiscussionSrcURL; diff --git a/announcements/resources/schemas/dbscripts/sqlserver/comm-create.sql b/announcements/resources/schemas/dbscripts/sqlserver/comm-create.sql index 9fcba880c5b..5ed139b93d9 100644 --- a/announcements/resources/schemas/dbscripts/sqlserver/comm-create.sql +++ b/announcements/resources/schemas/dbscripts/sqlserver/comm-create.sql @@ -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 ( diff --git a/announcements/src/org/labkey/announcements/AnnouncementModule.java b/announcements/src/org/labkey/announcements/AnnouncementModule.java index 23ff51bf9e1..91fef0bfacc 100644 --- a/announcements/src/org/labkey/announcements/AnnouncementModule.java +++ b/announcements/src/org/labkey/announcements/AnnouncementModule.java @@ -93,7 +93,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 25.002; + return 25.003; } @Override diff --git a/announcements/src/org/labkey/announcements/query/ThreadsTable.java b/announcements/src/org/labkey/announcements/query/ThreadsTable.java index 4950367cef8..db2fedd3ae4 100644 --- a/announcements/src/org/labkey/announcements/query/ThreadsTable.java +++ b/announcements/src/org/labkey/announcements/query/ThreadsTable.java @@ -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)); diff --git a/experiment/resources/schemas/dbscripts/postgresql/exp-25.015-25.016.sql b/experiment/resources/schemas/dbscripts/postgresql/exp-25.015-25.016.sql new file mode 100644 index 00000000000..f553d6ddf0e --- /dev/null +++ b/experiment/resources/schemas/dbscripts/postgresql/exp-25.015-25.016.sql @@ -0,0 +1 @@ +ALTER TABLE exp.List DROP COLUMN DiscussionSetting; diff --git a/experiment/resources/schemas/dbscripts/sqlserver/exp-25.015-25.016.sql b/experiment/resources/schemas/dbscripts/sqlserver/exp-25.015-25.016.sql new file mode 100644 index 00000000000..759e013c78c --- /dev/null +++ b/experiment/resources/schemas/dbscripts/sqlserver/exp-25.015-25.016.sql @@ -0,0 +1,2 @@ +EXEC core.fn_dropifexists 'List', 'exp', 'DEFAULT', 'DiscussionSetting'; +ALTER TABLE exp.List DROP COLUMN DiscussionSetting; diff --git a/experiment/resources/schemas/exp.xml b/experiment/resources/schemas/exp.xml index 1a3347f50df..959a40c6c0a 100644 --- a/experiment/resources/schemas/exp.xml +++ b/experiment/resources/schemas/exp.xml @@ -233,7 +233,6 @@ - diff --git a/experiment/src/org/labkey/experiment/ExperimentModule.java b/experiment/src/org/labkey/experiment/ExperimentModule.java index d57867806c2..232e064d838 100644 --- a/experiment/src/org/labkey/experiment/ExperimentModule.java +++ b/experiment/src/org/labkey/experiment/ExperimentModule.java @@ -202,7 +202,7 @@ public String getName() @Override public Double getSchemaVersion() { - return 25.015; + return 25.016; } @Nullable