Skip to content

Stored procedure update_container_assign: also return sample locations #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KarlLevik merged 1 commit into from
May 8, 2025
Merged

Stored procedure update_container_assign: also return sample locations #274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions schemas/ispyb/stored_programs/sp_update_container_assign.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ BEGIN
DECLARE row_proposalCode varchar(45) DEFAULT NULL;
DECLARE row_proposalNumber varchar(45) DEFAULT NULL;
DECLARE row_queuedCount int(11) unsigned DEFAULT NULL;
DECLARE row_samples varchar(255) DEFAULT NULL;

IF p_beamline IS NULL THEN
SIGNAL SQLSTATE '45000' SET MYSQL_ERRNO=1644, MESSAGE_TEXT='Mandatory argument p_beamline is NULL';
Expand Down Expand Up @@ -50,7 +51,7 @@ BEGIN
INNER JOIN ContainerRegistry cr ON c.containerRegistryId = cr.containerRegistryId
INNER JOIN Dewar d ON d.dewarId = c.dewarId
INNER JOIN Shipping s ON s.shippingId = d.shippingId
INNER JOIN Proposal p ON p.proposalId = s.proposalId
INNER JOIN Proposal p ON p.proposalId = s.proposalId
LEFT OUTER JOIN ContainerQueue cq ON cq.containerId = c.containerId
WHERE cr.barcode = p_registry_barcode
GROUP BY c.containerId,
Expand Down Expand Up @@ -116,10 +117,18 @@ BEGIN
ELSE
SIGNAL SQLSTATE '45000' SET MYSQL_ERRNO=1644, MESSAGE_TEXT='Mandatory argument p_registry_barcode is NULL';
END IF;

SELECT group_concat(location ORDER BY cast(location AS integer) SEPARATOR ',')
INTO row_samples
FROM BLSample
WHERE containerId = row_containerId
GROUP BY containerId;

SELECT row_containerId as "containerId",
currentContainerStatus as "containerStatus",
row_proposalCode as "proposalCode",
row_proposalNumber as "proposalNumber",
row_queuedCount as "queuedCount";
row_queuedCount as "queuedCount",
row_samples as "samples";
END ;;
DELIMITER ;