From 336f27a48e35a2d578cf33dae8502a02d83f0ab2 Mon Sep 17 00:00:00 2001 From: Stuart Fisher Date: Tue, 28 Jun 2022 14:59:30 +0200 Subject: [PATCH 1/4] add sampleimage positioners --- .../2022_06_28_sampleimage_positioner.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql diff --git a/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql b/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql new file mode 100644 index 00000000..75f432cc --- /dev/null +++ b/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql @@ -0,0 +1,18 @@ +INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2022_06_28_sampleimage_positioner.sql', 'ONGOING'); + +CREATE TABLE `BLSampleImage_has_Positioner` ( + `blSampleImageHasPositionerId` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `blSampleImageId` INT UNSIGNED NOT NULL, + `positionerId` INT UNSIGNED NOT NULL, + `value` float COMMENT 'The position of this positioner for this blsampleimage', + PRIMARY KEY (`blSampleImageHasPositionerId`), + CONSTRAINT `BLSampleImageHasPositioner_ibfk1` + FOREIGN KEY (`blSampleImageId`) + REFERENCES `BLSampleImage`(`blSampleImageId`) + ON DELETE RESTRICT ON UPDATE RESTRICT, + CONSTRAINT `BLSampleImageHasPositioner_ibfk2` + FOREIGN KEY (`positionerId`) + REFERENCES `Positioner`(`positionerId`) + ); + +UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2022_06_28_sampleimage_positioner.sql'; From e875269dd4a856b415f4c07dae58d59a57a5f912 Mon Sep 17 00:00:00 2001 From: Stuart Fisher Date: Tue, 16 Aug 2022 12:20:07 +0200 Subject: [PATCH 2/4] add engine, charset, and comment --- schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql b/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql index 75f432cc..1c2b3dcd 100644 --- a/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql +++ b/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql @@ -13,6 +13,6 @@ CREATE TABLE `BLSampleImage_has_Positioner` ( CONSTRAINT `BLSampleImageHasPositioner_ibfk2` FOREIGN KEY (`positionerId`) REFERENCES `Positioner`(`positionerId`) - ); + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Allows a BLSampleImage to store motor positions along with the image'; UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2022_06_28_sampleimage_positioner.sql'; From b1e1d99aeb2ae1a577a38d55775c2f608d92d648 Mon Sep 17 00:00:00 2001 From: Stuart Fisher Date: Tue, 16 Aug 2022 12:20:39 +0200 Subject: [PATCH 3/4] remove default --- schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql b/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql index 1c2b3dcd..970db7ad 100644 --- a/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql +++ b/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql @@ -8,8 +8,7 @@ CREATE TABLE `BLSampleImage_has_Positioner` ( PRIMARY KEY (`blSampleImageHasPositionerId`), CONSTRAINT `BLSampleImageHasPositioner_ibfk1` FOREIGN KEY (`blSampleImageId`) - REFERENCES `BLSampleImage`(`blSampleImageId`) - ON DELETE RESTRICT ON UPDATE RESTRICT, + REFERENCES `BLSampleImage`(`blSampleImageId`), CONSTRAINT `BLSampleImageHasPositioner_ibfk2` FOREIGN KEY (`positionerId`) REFERENCES `Positioner`(`positionerId`) From f52e881c6e7fb01ccda817b1fc68f3ba9f8980ac Mon Sep 17 00:00:00 2001 From: Stuart Fisher Date: Wed, 17 Aug 2022 11:59:58 +0200 Subject: [PATCH 4/4] remove charset --- schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql b/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql index 970db7ad..3c366903 100644 --- a/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql +++ b/schemas/ispyb/updates/2022_06_28_sampleimage_positioner.sql @@ -12,6 +12,6 @@ CREATE TABLE `BLSampleImage_has_Positioner` ( CONSTRAINT `BLSampleImageHasPositioner_ibfk2` FOREIGN KEY (`positionerId`) REFERENCES `Positioner`(`positionerId`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Allows a BLSampleImage to store motor positions along with the image'; + ) ENGINE=InnoDB COMMENT='Allows a BLSampleImage to store motor positions along with the image'; UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2022_06_28_sampleimage_positioner.sql';