Preparations for v4.9.0

Author: KarlLevik

HISTORY.rst

@@ -5,6 +5,33 @@ History
 Unreleased / master
 -------------------
 
+4.9.0 (2025-10-01)
+-------------------
+
+New columns:
+
+- Add ``startDate`` and ``endDate`` columns to the ``Proposal`` table
+- Add ``parentContainerLocation`` column to the ``Container`` table
+
+Table permissions for the expeye role:
+
+- ``BLSampleImage``
+- ``Protein_has_PDB``
+- The ``Ligand`` tables
+
+Stored procedures:
+
+- Updated procedure ``update_container_status`` to allow more statuses
+- New procedure ``insert_screening_v2`` with relevant grants
+- In source file for procedure ``retrieve_containers_on_beamline_with_status``:
+
+  - Use ``CREATE OR REPLACE ... PROCEDURE`` syntax
+  - Update maximum string length for ``p_status`` parameter
+
+Lookups:
+
+- A new type "SWISSCI 2 Drop" was added to ``ContainerType``  
+
 4.8.0 (2025-07-17)
 -------------------
 
@@ -32,7 +59,7 @@ New or modified tables, columns, lookup values:
 
 Roles and permissions:
 
-- Add new grants for Expeye 
+- Add new grants for Expeye
 - Add new permissions for ``ispyb_propagation``
 - Add new permissions for ``ispyb_scripts_processing.sql``
 

schemas/ispyb/lookups.sql

@@ -11,7 +11,7 @@
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
 /*!40000 ALTER TABLE `AdminVar` DISABLE KEYS */;
-INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','4.8.0');
+INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','4.9.0');
 /*!40000 ALTER TABLE `AdminVar` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `SchemaStatus` DISABLE KEYS */;
@@ -297,7 +297,9 @@ INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `rec
 (325,'2025_06_27_undo_ParticleClassification_set_Tomogram_pixelLocation.sql','DONE','2025-06-27 16:40:00'),
 (326,'2025_07_17_AdminVar_bump_version.sql','DONE','2025-09-24 11:36:21'),
 (327,'2025_07_25_Container_parentContainerLocation.sql','DONE','2025-09-24 11:36:21'),
-(328,'2025_09_24_Proposal_start_end_date.sql','DONE','2025-09-24 15:56:17');
+(328,'2025_09_24_Proposal_start_end_date.sql','DONE','2025-09-24 15:56:17'),
+(329,'2025_10_01_AdminVar_bump_version.sql','DONE','2025-10-01 15:40:02'),
+(330,'2025_07_29_ContainerType_insert.sql','DONE','2025-10-01 15:51:03');
 /*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `ComponentType` DISABLE KEYS */;
@@ -369,7 +371,8 @@ INSERT INTO `ContainerType` (`containerTypeId`, `name`, `proposalType`, `active`
 (35,'I22_Capillary_Rack_25','saxs',1,25,25,1,1,1,1,0,0,-1),
 (36,'VMXm-Cartridge','mx',1,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (37,'VMXm-GridBox','mx',1,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(38,'Cryo-EM Puck','mx',1,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+(38,'Cryo-EM Puck','mx',1,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(39,'SWISSCI 2 Drop','mx',1,192,12,1,2,1,1,0,0,1);
 /*!40000 ALTER TABLE `ContainerType` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `ExperimentType` DISABLE KEYS */;

schemas/ispyb/routines.sql

@@ -7827,7 +7827,8 @@ BEGIN
   DECLARE row_scLoc varchar(20) DEFAULT NULL;
 
   IF NOT (p_barcode IS NULL) AND p_status IN ('in_storage', 'in_localstorage', 'processing', 'disposed',
-	'in_transit_to_localstorage', 'in_transit_to_storage', 'in_transit_loading', 'in_transit_unloading', 'in_loadlock', 'in_transit_to_loadlock') THEN
+	'in_transit_to_localstorage', 'in_transit_to_storage', 'in_transit_loading', 'in_transit_unloading', 'in_loadlock', 'in_transit_to_loadlock',
+	'in_transit_to_loadlock_from_hotel', 'in_transit_to_loadlock_from_local_storage') THEN
 
 	SELECT containerId, sampleChangerLocation INTO row_containerId, row_scLoc
     FROM Container

schemas/ispyb/updates/2025_10_01_AdminVar_bump_version.sql

@@ -0,0 +1,5 @@
+INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2025_10_01_AdminVar_bump_version.sql', 'ONGOING');
+
+UPDATE AdminVar SET `value` = '4.9.0' WHERE `name` = 'schemaVersion';
+
+UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2025_10_01_AdminVar_bump_version.sql';