Merge 25.7 to 25.11

Author: labkey-teamcity

snprc_ehr/resources/etls/SndPackagesAndSuperPkgs.xml

@@ -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"/>

snprc_ehr/resources/schemas/dbscripts/sqlserver/snprc_ehr-25.000-25.001.sql

@@ -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

snprc_ehr/resources/schemas/snprc_ehr.xml

@@ -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"/>

snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRModule.java

@@ -118,7 +118,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 25.000;
+        return 25.001;
     }
 
     @Override