Skip to content

[bot] Merge 25.9 to develop #570

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
github-actions merged 3 commits into from
Sep 17, 2025
Merged

[bot] Merge 25.9 to develop #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a8e7d5
Send reminders to submitters of private data on Panorama Public (#566)
vagisha Sep 9, 2025
3300225
Merge 25.7 to 25.9
labkey-teamcity Sep 16, 2025
50cdb3b
Merge 25.9 to develop
labkey-teamcity Sep 17, 2025
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
21 changes: 21 additions & 0 deletions panoramapublic/resources/schemas/dbscripts/postgresql/panoramapublic-25.001-25.002.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
CREATE TABLE panoramapublic.DatasetStatus
(
_ts TIMESTAMP,
Id SERIAL NOT NULL,
CreatedBy USERID,
Created TIMESTAMP,
ModifiedBy USERID,
Modified TIMESTAMP,

ShortUrl ENTITYID NOT NULL,
LastReminderDate TIMESTAMP,
ExtensionRequestedDate TIMESTAMP,
DeletionRequestedDate TIMESTAMP,

CONSTRAINT PK_DatasetStatus PRIMARY KEY (Id),

CONSTRAINT FK_DatasetStatus_ShortUrl FOREIGN KEY (ShortUrl) REFERENCES core.shorturl (entityId),

CONSTRAINT UQ_DatasetStatus_ShortUrl UNIQUE (ShortUrl)
);
CREATE INDEX IX_DatasetStatus_ShortUrl ON panoramapublic.DatasetStatus(ShortUrl);
32 changes: 32 additions & 0 deletions panoramapublic/resources/schemas/dbscripts/postgresql/panoramapublic-25.002-25.003.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
-- ------------------------------------------------------------------------
-- Replace the ShortUrl column with an ExperimentAnnotationsId column.
-- ------------------------------------------------------------------------

-- Add ExperimentAnnotationsId column as nullable first
ALTER TABLE panoramapublic.DatasetStatus ADD COLUMN ExperimentAnnotationsId INT;

-- Populate the column by matching ShortUrl values
UPDATE panoramapublic.DatasetStatus
SET ExperimentAnnotationsId = ea.Id
FROM panoramapublic.ExperimentAnnotations ea
WHERE ea.ShortUrl = panoramapublic.DatasetStatus.ShortUrl;

-- Delete rows that couldn't be matched (where ExperimentAnnotationsId is still null)
DELETE FROM panoramapublic.DatasetStatus WHERE ExperimentAnnotationsId IS NULL;

-- Now make ExperimentAnnotationsId NOT NULL
ALTER TABLE panoramapublic.DatasetStatus ALTER COLUMN ExperimentAnnotationsId SET NOT NULL;

-- Add constraints and index
ALTER TABLE panoramapublic.DatasetStatus ADD CONSTRAINT FK_DatasetStatus_ExperimentAnnotations FOREIGN KEY (ExperimentAnnotationsId) REFERENCES panoramapublic.ExperimentAnnotations(Id);
ALTER TABLE panoramapublic.DatasetStatus ADD CONSTRAINT UQ_DatasetStatus_ExperimentAnnotations UNIQUE (ExperimentAnnotationsId);
CREATE INDEX IX_DatasetStatus_ExperimentAnnotations ON panoramapublic.DatasetStatus(ExperimentAnnotationsId);

-- Drop old constraints and index
ALTER TABLE panoramapublic.DatasetStatus DROP CONSTRAINT FK_DatasetStatus_ShortUrl;
ALTER TABLE panoramapublic.DatasetStatus DROP CONSTRAINT UQ_DatasetStatus_ShortUrl;
DROP INDEX panoramapublic.IX_DatasetStatus_ShortUrl;

-- Finally drop the ShortUrl column
ALTER TABLE panoramapublic.DatasetStatus DROP COLUMN ShortUrl;

34 changes: 34 additions & 0 deletions panoramapublic/resources/schemas/panoramapublic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,4 +832,38 @@
<column columnName="Approved"/>
</columns>
</table>
<table tableName="DatasetStatus" tableDbType="TABLE">
<columns>
<column columnName="_ts">
<isHidden>true</isHidden>
</column>
<column columnName="Created">
<isHidden>true</isHidden>
</column>
<column columnName="CreatedBy">
<fk>
<fkColumnName>UserId</fkColumnName>
<fkDbSchema>core</fkDbSchema>
<fkTable>UsersData</fkTable>
</fk>
<isHidden>true</isHidden>
</column>
<column columnName="Modified">
<isHidden>true</isHidden>
</column>
<column columnName="ModifiedBy">
<fk>
<fkColumnName>UserId</fkColumnName>
<fkDbSchema>core</fkDbSchema>
<fkTable>UsersData</fkTable>
</fk>
<isHidden>true</isHidden>
</column>
<column columnName="Id"/>
<column columnName="ExperimentAnnotationsId" />
<column columnName="LastReminderDate" />
<column columnName="ExtensionRequestedDate" />
<column columnName="DeletionRequestedDate"/>
</columns>
</table>
</tables>
Loading
Loading