From 1f0d4d8a9bea8f36a5886519f851876e9c0ff8ef Mon Sep 17 00:00:00 2001 From: KarlLevik <1378676+KarlLevik@users.noreply.github.com> Date: Tue, 14 May 2024 15:07:34 +0000 Subject: [PATCH] Update database sql files --- schemas/ispyb/lookups.sql | 6 ++++-- schemas/ispyb/tables.sql | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/schemas/ispyb/lookups.sql b/schemas/ispyb/lookups.sql index 823262c2..fcfc36de 100644 --- a/schemas/ispyb/lookups.sql +++ b/schemas/ispyb/lookups.sql @@ -256,7 +256,8 @@ INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `rec (285,'2024_03_20_Shipping_Dewar_externalIds.sql','DONE','2024-03-26 16:40:34'), (286,'2024_03_26_AdminVar_bump_version.sql','DONE','2024-03-26 16:40:34'), (287,'2024_03_26_AutoProc_index_refined_unit_cell.sql','DONE','2024-03-26 16:40:34'), -(288,'2023_11_16_AdminVar_bump_version.sql','DONE','2024-03-26 16:47:25'); +(288,'2023_11_16_AdminVar_bump_version.sql','DONE','2024-03-26 16:47:25'), +(289,'2024_05_14_DataCollectionGroup_experimentType.sql','DONE','2024-05-14 15:07:29'); /*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */; /*!40000 ALTER TABLE `ComponentType` DISABLE KEYS */; @@ -370,7 +371,8 @@ INSERT INTO `ExperimentType` (`experimentTypeId`, `name`, `proposalType`, `activ (39,'Serial Jet','mx',1), (40,'Still','mx',1), (41,'SSX-Chip','mx',1), -(42,'SSX-Jet','mx',1); +(42,'SSX-Jet','mx',1), +(43,'Metal ID','mx',1); /*!40000 ALTER TABLE `ExperimentType` ENABLE KEYS */; /*!40000 ALTER TABLE `InspectionType` DISABLE KEYS */; diff --git a/schemas/ispyb/tables.sql b/schemas/ispyb/tables.sql index 13045a9d..c1dc0928 100644 --- a/schemas/ispyb/tables.sql +++ b/schemas/ispyb/tables.sql @@ -1507,7 +1507,7 @@ CREATE TABLE `DataCollectionGroup` ( `sessionId` int(10) unsigned NOT NULL COMMENT 'references Session table', `comments` varchar(1024) DEFAULT NULL COMMENT 'comments', `blSampleId` int(10) unsigned DEFAULT NULL COMMENT 'references BLSample table', - `experimentType` enum('SAD','SAD - Inverse Beam','OSC','Collect - Multiwedge','MAD','Helical','Multi-positional','Mesh','Burn','MAD - Inverse Beam','Characterization','Dehydration','tomo','experiment','EM','PDF','PDF+Bragg','Bragg','single particle','Serial Fixed','Serial Jet','Standard','Time Resolved','Diamond Anvil High Pressure','Custom','XRF map','Energy scan','XRF spectrum','XRF map xas','Mesh3D','Screening','Still','SSX-Chip','SSX-Jet') DEFAULT NULL COMMENT 'Standard: Routine structure determination experiment. Time Resolved: Investigate the change of a system over time. Custom: Special or non-standard data collection.', + `experimentType` enum('SAD','SAD - Inverse Beam','OSC','Collect - Multiwedge','MAD','Helical','Multi-positional','Mesh','Burn','MAD - Inverse Beam','Characterization','Dehydration','tomo','experiment','EM','PDF','PDF+Bragg','Bragg','single particle','Serial Fixed','Serial Jet','Standard','Time Resolved','Diamond Anvil High Pressure','Custom','XRF map','Energy scan','XRF spectrum','XRF map xas','Mesh3D','Screening','Still','SSX-Chip','SSX-Jet','Metal ID') DEFAULT NULL COMMENT 'Standard: Routine structure determination experiment. Time Resolved: Investigate the change of a system over time. Custom: Special or non-standard data collection.', `startTime` datetime DEFAULT NULL COMMENT 'Start time of the dataCollectionGroup', `endTime` datetime DEFAULT NULL COMMENT 'end time of the dataCollectionGroup', `crystalClass` varchar(20) DEFAULT NULL COMMENT 'Crystal Class for industrials users',