Merge branch 'develop' into fb_dataclassLock

Author: labkey-danield

core/module.properties

@@ -1,6 +1,6 @@
 Name: Core
 ModuleClass: org.labkey.core.CoreModule
-SchemaVersion: 26.000
+SchemaVersion: 26.001
 Label: Administration and Essential Services
 Description: The Core module provides central services such as login, \
     security, administration, folder management, user management, \

core/resources/schemas/dbscripts/postgresql/core-26.000-26.001.sql

@@ -0,0 +1,3 @@
+-- Extraction of parent EntityIds from data class LSIDs has been fixed, so re-run population of the ParentType column.
+-- Keep the invocation in core-25.008-25.009.sql since core-25.009-25.010.sql relies on ParentType being populated.
+SELECT core.executeJavaUpgradeCode('populateAttachmentParentTypeColumn');

core/resources/schemas/dbscripts/sqlserver/core-26.000-26.001.sql

@@ -0,0 +1,3 @@
+-- Extraction of parent EntityIds from data class LSIDs has been fixed, so re-run population of the ParentType column.
+-- Keep the invocation in core-25.008-25.009.sql since core-25.009-25.010.sql relies on ParentType being populated.
+EXEC core.executeJavaUpgradeCode 'populateAttachmentParentTypeColumn';

core/src/org/labkey/core/CoreUpgradeCode.java

@@ -82,6 +82,7 @@ public static void migrateAllowedExternalConnectionHosts(ModuleContext context)
 
     /**
      * Called from core-25.008-25.009.sql
+     * Called from core-26.000-26.001.sql
      */
     @SuppressWarnings("unused")
     @DeferredUpgrade