From c960147ed5cc56dee869a89267820930543e1b8b Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Tue, 22 Jul 2025 13:52:12 +0100 Subject: [PATCH] Use CREATE OR REPLACE ... PROCEDURE syntax --- .../sp_retrieve_containers_on_beamline_with_status.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/ispyb/stored_programs/sp_retrieve_containers_on_beamline_with_status.sql b/schemas/ispyb/stored_programs/sp_retrieve_containers_on_beamline_with_status.sql index 8d637bb..0656bb2 100644 --- a/schemas/ispyb/stored_programs/sp_retrieve_containers_on_beamline_with_status.sql +++ b/schemas/ispyb/stored_programs/sp_retrieve_containers_on_beamline_with_status.sql @@ -1,5 +1,5 @@ DELIMITER ;; -CREATE DEFINER=`ispyb_root`@`%` PROCEDURE `retrieve_containers_on_beamline_with_status`(IN p_beamline varchar(20), IN p_status varchar(45)) +CREATE OR REPLACE DEFINER=`ispyb_root`@`%` PROCEDURE `retrieve_containers_on_beamline_with_status`(IN p_beamline varchar(20), IN p_status varchar(45)) READS SQL DATA COMMENT 'Returns a multi-row result-set with info about when containers on beamline p_beamline last had status p_status' BEGIN @@ -7,10 +7,10 @@ BEGIN SELECT c.barcode "barcode", c.sampleChangerLocation "location", max(ch.blTimeStamp) "added" FROM Container c LEFT OUTER JOIN ContainerHistory ch ON c.containerId = ch.containerId AND ch.status = p_status - WHERE c.containerStatus = p_status AND ch.beamlineName = p_beamline + WHERE c.containerStatus = p_status AND ch.beamlineName = p_beamline GROUP BY c.barcode, c.sampleChangerLocation ORDER BY ch.blTimeStamp ASC; - ELSE + ELSE SIGNAL SQLSTATE '45000' SET MYSQL_ERRNO=1644, MESSAGE_TEXT='Mandatory arguments p_status and/or p_beamline are NULL'; END IF; END ;;