Skip to content

[bot] Merge 25.11 to develop #870

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
Dec 23, 2025
Merged

[bot] Merge 25.11 to develop #870

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
4bafb75
Fixed issues related to primary key issues in the super package stagi…
spamhurts Dec 17, 2025
eafd517
Merge 25.7 to 25.11
labkey-teamcity Dec 22, 2025
dd4229d
Merge 25.11 to develop
labkey-teamcity Dec 23, 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
5 changes: 0 additions & 5 deletions snprc_ehr/resources/etls/SndPackagesAndSuperPkgs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@
<description>Copy to Staging table</description>
<source schemaName="snprcSrc" queryName="v_sndGetAllSuperPkgs" />
<destination schemaName="snprc_ehr" queryName="SndSuperPackageStaging" bulkLoad="true" targetOption="merge">
<alternateKeys>
<column name="TopLevelPkgId"/>
<column name = "SuperPkgId"/>
<column name="ObjectId"/>
</alternateKeys>
<columnTransforms>
<column source="createdBy" target="createdBy" transformClass="org.labkey.snprc_ehr.columnTransforms.UserTransform"/>
<column source="modifiedBy" target="modifiedBy" transformClass="org.labkey.snprc_ehr.columnTransforms.UserTransform"/>
Expand Down
27 changes: 27 additions & 0 deletions snprc_ehr/resources/schemas/dbscripts/sqlserver/snprc_ehr-25.000-25.001.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
EXEC core.fn_dropifexists @objname = 'SndSuperPackageStaging', @objschema = 'snprc_ehr', @objtype = 'TABLE';

CREATE TABLE snprc_ehr.SndSuperPackageStaging
(
TopLevelPkgId INTEGER NOT NULL,
SuperPkgId INTEGER NOT NULL,
ParentSuperPkgId INTEGER NULL,
PkgId INTEGER NOT NULL,
TreePath VARCHAR(800) NOT NULL,
SuperPkgPath VARCHAR(MAX) NOT NULL,
SortOrder INTEGER NULL,
Required INTEGER NULL,
Description VARCHAR(MAX) NOT NULL,
Narrative VARCHAR(MAX) NOT NULL,
Active INTEGER NOT NULL,
Repeatable INTEGER NOT NULL,
Level INTEGER NOT NULL,
Created DATETIME NOT NULL,
CreatedBy USERID NOT NULL,
Modified DATETIME NOT NULL,
ModifiedBy USERID NOT NULL,
diModified DATETIME NOT NULL,
ObjectId UNIQUEIDENTIFIER NOT NULL

CONSTRAINT PK_SndSuperPackageStaging PRIMARY KEY CLUSTERED ( TopLevelPkgId, SuperPkgId, TreePath)
);
GO
2 changes: 1 addition & 1 deletion snprc_ehr/resources/schemas/snprc_ehr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2374,7 +2374,7 @@
</table>
<table tableName="SndSuperPackageStaging" tableDbType="TABLE" useColumnOrder="true">
<tableTitle>Super PackageStaging</tableTitle>
<pkColumnName>TopLevelPkgId, SuperPkgId</pkColumnName>
<pkColumnName>TopLevelPkgId, SuperPkgId, TreePath</pkColumnName>
<columns>
<column columnName="TopLevelPkgId"/>
<column columnName="SuperPkgId"/>
Expand Down
2 changes: 1 addition & 1 deletion snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 25.000;
return 25.001;
}

@Override
Expand Down
Loading