Update database sql files (#167)

Co-authored-by: KarlLevik <[email protected]>

Author: github-actions[bot]

schemas/ispyb/data.sql

@@ -329,6 +329,9 @@ INSERT INTO `BeamLineSetup` (`beamLineSetupId`, `detectorId`, `synchrotronMode`,
 /*!40000 ALTER TABLE `CalendarHash` DISABLE KEYS */;
 /*!40000 ALTER TABLE `CalendarHash` ENABLE KEYS */;
 
+/*!40000 ALTER TABLE `Component` DISABLE KEYS */;
+/*!40000 ALTER TABLE `Component` ENABLE KEYS */;
+
 /*!40000 ALTER TABLE `ComponentLattice` DISABLE KEYS */;
 INSERT INTO `ComponentLattice` (`componentLatticeId`, `componentId`, `spaceGroup`, `cell_a`, `cell_b`, `cell_c`, `cell_alpha`, `cell_beta`, `cell_gamma`) VALUES (1,123497,'P21',10.1,11.1,12.1,90.1,90.2,90.3);
 /*!40000 ALTER TABLE `ComponentLattice` ENABLE KEYS */;
@@ -408,6 +411,9 @@ INSERT INTO `Crystal` (`crystalId`, `diffractionPlanId`, `proteinId`, `crystalUU
 (333308,NULL,123497,NULL,'SampleType01','P12121',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample type comments ...',NULL,NULL,'2017-03-23 22:06:42',NULL,NULL);
 /*!40000 ALTER TABLE `Crystal` ENABLE KEYS */;
 
+/*!40000 ALTER TABLE `CrystalComposition` DISABLE KEYS */;
+/*!40000 ALTER TABLE `CrystalComposition` ENABLE KEYS */;
+
 /*!40000 ALTER TABLE `Crystal_has_UUID` DISABLE KEYS */;
 /*!40000 ALTER TABLE `Crystal_has_UUID` ENABLE KEYS */;
 
@@ -509,6 +515,19 @@ INSERT INTO `EnergyScan` (`energyScanId`, `sessionId`, `blSampleId`, `fluorescen
 (50290,55168,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `EnergyScan` ENABLE KEYS */;
 
+/*!40000 ALTER TABLE `Event` DISABLE KEYS */;
+/*!40000 ALTER TABLE `Event` ENABLE KEYS */;
+
+/*!40000 ALTER TABLE `EventChain` DISABLE KEYS */;
+/*!40000 ALTER TABLE `EventChain` ENABLE KEYS */;
+
+/*!40000 ALTER TABLE `EventType` DISABLE KEYS */;
+INSERT INTO `EventType` (`eventTypeId`, `name`) VALUES (3,'LaserExcitation'),
+(4,'ReactionTrigger'),
+(1,'XrayDetection'),
+(2,'XrayExposure');
+/*!40000 ALTER TABLE `EventType` ENABLE KEYS */;
+
 /*!40000 ALTER TABLE `Experiment` DISABLE KEYS */;
 /*!40000 ALTER TABLE `Experiment` ENABLE KEYS */;
 
@@ -798,12 +817,18 @@ INSERT INTO `Protein_has_PDB` (`proteinhaspdbid`, `proteinid`, `pdbid`) VALUES (
 /*!40000 ALTER TABLE `SAXSDATACOLLECTIONGROUP` DISABLE KEYS */;
 /*!40000 ALTER TABLE `SAXSDATACOLLECTIONGROUP` ENABLE KEYS */;
 
+/*!40000 ALTER TABLE `SSXDataCollection` DISABLE KEYS */;
+/*!40000 ALTER TABLE `SSXDataCollection` ENABLE KEYS */;
+
 /*!40000 ALTER TABLE `SW_onceToken` DISABLE KEYS */;
 /*!40000 ALTER TABLE `SW_onceToken` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `SafetyLevel` DISABLE KEYS */;
 /*!40000 ALTER TABLE `SafetyLevel` ENABLE KEYS */;
 
+/*!40000 ALTER TABLE `SampleComposition` DISABLE KEYS */;
+/*!40000 ALTER TABLE `SampleComposition` ENABLE KEYS */;
+
 /*!40000 ALTER TABLE `SamplePlate` DISABLE KEYS */;
 /*!40000 ALTER TABLE `SamplePlate` ENABLE KEYS */;
 

schemas/ispyb/lookups.sql

@@ -210,14 +210,20 @@ INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `rec
 (235,'2022_11_02_AdminVar_bump_version.sql','DONE','2022-11-02 17:04:27'),
 (236,'2023_01_16_Tomogram_new_cols.sql','DONE','2023-01-16 18:09:03'),
 (237,'2023_01_16_AdminVar_bump_version.sql','DONE','2023-01-16 18:42:40'),
-(238,'2023_01_19_AdminVar_bump_version.sql','DONE','2023-01-19 12:24:28');
+(238,'2023_01_19_AdminVar_bump_version.sql','DONE','2023-01-19 12:24:28'),
+(239,'2023_02_01_PDB_contents_compressed.sql','DONE','2023-02-21 13:20:55'),
+(240,'2023_02_01_Tomogram_drop_processingJobId.sql','DONE','2023-02-21 13:20:55'),
+(241,'2023_02_14_SSX_experiment.sql','DONE','2023-02-21 13:20:55');
 /*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `ComponentType` DISABLE KEYS */;
-INSERT INTO `ComponentType` (`componentTypeId`, `name`) VALUES (1,'Protein'),
+INSERT INTO `ComponentType` (`componentTypeId`, `name`) VALUES (6,'Buffer'),
 (2,'DNA'),
-(3,'Small Molecule'),
-(4,'RNA');
+(7,'JetMaterial'),
+(5,'Ligand'),
+(1,'Protein'),
+(4,'RNA'),
+(3,'Small Molecule');
 /*!40000 ALTER TABLE `ComponentType` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `ComponentSubType` DISABLE KEYS */;
@@ -316,7 +322,12 @@ INSERT INTO `ExperimentType` (`experimentTypeId`, `name`, `proposalType`, `activ
 (34,'Mesh3D','mx',1),
 (35,'Screening','sm',1),
 (36,'Tomography','em',1),
-(37,'Single Particle','em',1);
+(37,'Single Particle','em',1),
+(38,'Serial Fixed','mx',1),
+(39,'Serial Jet','mx',1),
+(40,'Still','mx',1),
+(41,'SSX-Chip','mx',1),
+(42,'SSX-Jet','mx',1);
 /*!40000 ALTER TABLE `ExperimentType` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `InspectionType` DISABLE KEYS */;

schemas/ispyb/routines.sql

@@ -130,7 +130,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb3 */ ;
 /*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 DELIMITER ;;
-CREATE FUNCTION `retrieve_proposal_title`(p_proposal_code varchar(5), p_proposal_number int) RETURNS varchar(255) CHARSET latin1
+CREATE FUNCTION `retrieve_proposal_title`(p_proposal_code varchar(5), p_proposal_number int) RETURNS varchar(255) CHARSET latin1 COLLATE latin1_swedish_ci
     READS SQL DATA
 BEGIN
 	DECLARE ret_title varchar(255);
@@ -155,7 +155,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb3 */ ;
 /*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 DELIMITER ;;
-CREATE FUNCTION `retrieve_proposal_title_v2`(p_proposalCode varchar(5), p_proposalNumber int) RETURNS varchar(255) CHARSET latin1
+CREATE FUNCTION `retrieve_proposal_title_v2`(p_proposalCode varchar(5), p_proposalNumber int) RETURNS varchar(255) CHARSET latin1 COLLATE latin1_swedish_ci
     READS SQL DATA
     COMMENT 'Retrieve the title for a given proposal code and number.'
 BEGIN
@@ -206,7 +206,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = utf8mb3 */ ;
 /*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
 DELIMITER ;;
-CREATE FUNCTION `root_replace`(p_str varchar(255), p_oldroot varchar(255), p_newroot varchar(255)) RETURNS varchar(255) CHARSET latin1
+CREATE FUNCTION `root_replace`(p_str varchar(255), p_oldroot varchar(255), p_newroot varchar(255)) RETURNS varchar(255) CHARSET latin1 COLLATE latin1_swedish_ci
     COMMENT 'Returns a varchar where the old root p_oldroot (the leftmost part) of p_str has been replaced with a new root p_newroot'
 BEGIN
  DECLARE path_len smallint unsigned DEFAULT LENGTH(p_oldroot);