Merge 25.4 to develop

Author: labkey-teamcity

laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.305-12.306.sql

@@ -5,7 +5,7 @@ ALTER TABLE laboratory.species ADD createdby int;
 ALTER TABLE laboratory.species ADD modified timestamp;
 ALTER TABLE laboratory.species ADD modifiedby int;
 
-UPDATE laboratory.species SET container = (SELECT entityid FROM core.containers WHERE name = 'Shared');
+UPDATE laboratory.species SET container = (SELECT entityid FROM core.containers c1 WHERE name = 'Shared' and (select parent from core.Containers c2 where c2.EntityId = c1.Parent) is null);
 
 ALTER TABLE laboratory.species DROP CONSTRAINT PK_species;
 ALTER TABLE laboratory.species ADD CONSTRAINT PK_species PRIMARY KEY (rowid);

laboratory/resources/schemas/dbscripts/sqlserver/laboratory-12.305-12.306.sql

@@ -5,7 +5,7 @@ ALTER TABLE laboratory.species ADD createdby int;
 ALTER TABLE laboratory.species ADD modified datetime;
 ALTER TABLE laboratory.species ADD modifiedby int;
 GO
-UPDATE laboratory.species SET container = (SELECT entityid FROM core.containers WHERE name = 'Shared');
+UPDATE laboratory.species SET container = (SELECT entityid FROM core.containers c1 WHERE name = 'Shared' and (select parent from core.Containers c2 where c2.EntityId = c1.Parent) is null);
 
 ALTER TABLE laboratory.species DROP CONSTRAINT PK_species;
 ALTER TABLE laboratory.species ADD CONSTRAINT PK_species PRIMARY KEY (rowid);