Update database sql files

DiamondLightSource · Sep 17, 2024 · 7a6795f · 7a6795f
1 parent 1060c17
commit 7a6795f
Show file tree

Hide file tree

Showing 4 changed files with 235 additions and 230 deletions.
diff --git a/schemas/ispyb/data.sql b/schemas/ispyb/data.sql
@@ -211,9 +211,9 @@ INSERT INTO `BLSample` (`blSampleId`, `diffractionPlanId`, `crystalId`, `contain
 /*!40000 ALTER TABLE `BLSample` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `BLSampleGroup` DISABLE KEYS */;
-INSERT INTO `BLSampleGroup` (`blSampleGroupId`, `name`, `proposalId`) VALUES (5,NULL,37027),
-(6,'foo',37027),
-(7,'bar',37027);
+INSERT INTO `BLSampleGroup` (`blSampleGroupId`, `name`, `proposalId`, `ownerId`) VALUES (5,NULL,37027,NULL),
+(6,'foo',37027,NULL),
+(7,'bar',37027,NULL);
 /*!40000 ALTER TABLE `BLSampleGroup` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `BLSampleGroup_has_BLSample` DISABLE KEYS */;
@@ -633,6 +633,9 @@ INSERT INTO `Position` (`positionId`, `relativePositionId`, `posX`, `posY`, `pos
 /*!40000 ALTER TABLE `PreparePhasingData` DISABLE KEYS */;
 /*!40000 ALTER TABLE `PreparePhasingData` ENABLE KEYS */;
 
+/*!40000 ALTER TABLE `ProcessedTomogram` DISABLE KEYS */;
+/*!40000 ALTER TABLE `ProcessedTomogram` ENABLE KEYS */;
+
 /*!40000 ALTER TABLE `ProcessingJob` DISABLE KEYS */;
 INSERT INTO `ProcessingJob` (`processingJobId`, `dataCollectionId`, `displayName`, `comments`, `recordTimestamp`, `recipe`, `automatic`) VALUES (5,1002287,'test job 01','Testing the job submission system','2017-10-16 11:02:12','DIALS/xia2',0);
 /*!40000 ALTER TABLE `ProcessingJob` ENABLE KEYS */;

diff --git a/schemas/ispyb/lookups.sql b/schemas/ispyb/lookups.sql
@@ -263,7 +263,9 @@ INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `rec
 (292,'2024_07_16_ContainerType_insert_new.sql','DONE','2024-08-14 11:23:41'),
 (293,'2024_08_08_ProcessedTomogram.sql','DONE','2024-08-14 11:23:41'),
 (294,'2024_08_14_AdminVar_bump_version.sql','DONE','2024-08-14 11:23:41'),
-(295,'2024_08_19_AdminVar_bump_version.sql','DONE','2024-08-19 12:17:10');
+(295,'2024_08_19_AdminVar_bump_version.sql','DONE','2024-08-19 12:17:10'),
+(296,'2024_09_04_ProcessedTomogram_comment','ONGOING','2024-09-17 16:31:51'),
+(297,'2024_09_17_SpaceGroup_trim','ONGOING','2024-09-17 16:31:51');
 /*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `ComponentType` DISABLE KEYS */;
@@ -523,20 +525,20 @@ INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortNa
 (48,48,'Pnnn','P nn n',NULL,NULL,NULL,NULL,0),
 (49,49,'Pccm','P cc m',NULL,NULL,NULL,NULL,0),
 (50,50,'Pban','P ba n',NULL,NULL,NULL,NULL,0),
-(51,51,'Pmma1','P mm a1',NULL,NULL,NULL,NULL,0),
-(52,52,'Pnna1','P nn a1',NULL,NULL,NULL,NULL,0),
-(53,53,'Pmna1','P mn a1',NULL,NULL,NULL,NULL,0),
-(54,54,'Pcca1','P cc a1',NULL,NULL,NULL,NULL,0),
-(55,55,'Pbam1','P ba m1',NULL,NULL,NULL,NULL,0),
-(56,56,'Pccn1','P cc n1',NULL,NULL,NULL,NULL,0),
-(57,57,'Pbcm1','P bc m1',NULL,NULL,NULL,NULL,0),
-(58,58,'Pnnm1','P nn m1',NULL,NULL,NULL,NULL,0),
-(59,59,'Pmmn1','P mm n1',NULL,NULL,NULL,NULL,0),
-(60,60,'Pbcn1','P bc n1',NULL,NULL,NULL,NULL,0),
-(61,61,'Pbca1','P bc a1',NULL,NULL,NULL,NULL,0),
-(62,62,'Pnma1','P nm a1',NULL,NULL,NULL,NULL,0),
-(63,63,'Cmcm1','C mc m1',NULL,NULL,NULL,NULL,0),
-(64,64,'Cmca1','C mc a1',NULL,NULL,NULL,NULL,0),
+(51,51,'Pmma','P mm a1',NULL,NULL,NULL,NULL,0),
+(52,52,'Pnna','P nn a1',NULL,NULL,NULL,NULL,0),
+(53,53,'Pmna','P mn a1',NULL,NULL,NULL,NULL,0),
+(54,54,'Pcca','P cc a1',NULL,NULL,NULL,NULL,0),
+(55,55,'Pbam','P ba m1',NULL,NULL,NULL,NULL,0),
+(56,56,'Pccn','P cc n1',NULL,NULL,NULL,NULL,0),
+(57,57,'Pbcm','P bc m1',NULL,NULL,NULL,NULL,0),
+(58,58,'Pnnm','P nn m1',NULL,NULL,NULL,NULL,0),
+(59,59,'Pmmn','P mm n1',NULL,NULL,NULL,NULL,0),
+(60,60,'Pbcn','P bc n1',NULL,NULL,NULL,NULL,0),
+(61,61,'Pbca','P bc a1',NULL,NULL,NULL,NULL,0),
+(62,62,'Pnma','P nm a1',NULL,NULL,NULL,NULL,0),
+(63,63,'Cmcm','C mc m1',NULL,NULL,NULL,NULL,0),
+(64,64,'Cmca','C mc a1',NULL,NULL,NULL,NULL,0),
 (65,65,'Cmmm','C mm m',NULL,NULL,NULL,NULL,0),
 (66,66,'Cccm','C cc m',NULL,NULL,NULL,NULL,0),
 (67,67,'Cmma','C mm a',NULL,NULL,NULL,NULL,0),
@@ -545,8 +547,8 @@ INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortNa
 (70,70,'Fddd','F dd d',NULL,NULL,NULL,NULL,0),
 (71,71,'Immm','I mm m',NULL,NULL,NULL,NULL,0),
 (72,72,'Ibam','I ba m',NULL,NULL,NULL,NULL,0),
-(73,73,'Ibca1','I b c a1',NULL,NULL,NULL,NULL,0),
-(74,74,'Imma1','I mm a1',NULL,NULL,NULL,NULL,0),
+(73,73,'Ibca','I b c a1',NULL,NULL,NULL,NULL,0),
+(74,74,'Imma','I mm a1',NULL,NULL,NULL,NULL,0),
 (75,75,'P4','P4','tP',NULL,NULL,NULL,1),
 (76,76,'P41','P41','tP',NULL,NULL,NULL,1),
 (77,77,'P42','P42','tP',NULL,NULL,NULL,1),
@@ -599,10 +601,10 @@ INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortNa
 (124,124,'P4/mcc','P4/m c c',NULL,NULL,NULL,NULL,0),
 (125,125,'P4/nbm','P4/n b m',NULL,NULL,NULL,NULL,0),
 (126,126,'P4/nnc','P4/n n c',NULL,NULL,NULL,NULL,0),
-(127,127,'P4/mbm1','P4/m b m1',NULL,NULL,NULL,NULL,0),
-(128,128,'P4/mnc1','P4/m n c1',NULL,NULL,NULL,NULL,0),
-(129,129,'P4/nmm1','P4/n m m1',NULL,NULL,NULL,NULL,0),
-(130,130,'P4/ncc1','P4/n c c1',NULL,NULL,NULL,NULL,0),
+(127,127,'P4/mbm','P4/m b m1',NULL,NULL,NULL,NULL,0),
+(128,128,'P4/mnc','P4/m n c1',NULL,NULL,NULL,NULL,0),
+(129,129,'P4/nmm','P4/n m m1',NULL,NULL,NULL,NULL,0),
+(130,130,'P4/ncc','P4/n c c1',NULL,NULL,NULL,NULL,0),
 (131,131,'P42/mmc','P42/m m c',NULL,NULL,NULL,NULL,0),
 (132,132,'P42/mcm','P42/m c m',NULL,NULL,NULL,NULL,0),
 (133,133,'P42/nbc','P42/n b c',NULL,NULL,NULL,NULL,0),
@@ -677,8 +679,8 @@ INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortNa
 (202,202,'Fm-3','Fm -3',NULL,NULL,NULL,NULL,0),
 (203,203,'Fd-3','Fd -3',NULL,NULL,NULL,NULL,0),
 (204,204,'Im-3','Im -3',NULL,NULL,NULL,NULL,0),
-(205,205,'Pa-31','Pa -31',NULL,NULL,NULL,NULL,0),
-(206,206,'Ia-31','Ia -31',NULL,NULL,NULL,NULL,0),
+(205,205,'Pa-3','Pa -31',NULL,NULL,NULL,NULL,0),
+(206,206,'Ia-3','Ia -31',NULL,NULL,NULL,NULL,0),
 (207,207,'P432','P4 3 2','cP',NULL,NULL,NULL,1),
 (208,208,'P4232','P42 3 2','cP',NULL,NULL,NULL,1),
 (209,209,'F432','F4 3 2','cF',NULL,NULL,NULL,1),
@@ -695,14 +697,14 @@ INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortNa
 (220,220,'I-43d','I-4 3 d',NULL,NULL,NULL,NULL,0),
 (221,221,'Pm-3m','Pm -3 m',NULL,NULL,NULL,NULL,0),
 (222,222,'Pn-3n','Pn -3 n',NULL,NULL,NULL,NULL,0),
-(223,223,'Pm-3n1','Pm -3 n1',NULL,NULL,NULL,NULL,0),
-(224,224,'Pn-3m1','Pn -3 m1',NULL,NULL,NULL,NULL,0),
+(223,223,'Pm-3n','Pm -3 n1',NULL,NULL,NULL,NULL,0),
+(224,224,'Pn-3m','Pn -3 m1',NULL,NULL,NULL,NULL,0),
 (225,225,'Fm-3m','Fm -3 m',NULL,NULL,NULL,NULL,0),
 (226,226,'Fm-3c','Fm -3 c',NULL,NULL,NULL,NULL,0),
-(227,227,'Fd-3m1','Fd -3 m1',NULL,NULL,NULL,NULL,0),
-(228,228,'Fd-3c1','Fd -3 c1',NULL,NULL,NULL,NULL,0),
+(227,227,'Fd-3m','Fd -3 m1',NULL,NULL,NULL,NULL,0),
+(228,228,'Fd-3c','Fd -3 c1',NULL,NULL,NULL,NULL,0),
 (229,229,'Im-3m','Im -3 m',NULL,NULL,NULL,NULL,0),
-(230,230,'Ia-3d1','Ia -3 d1',NULL,NULL,NULL,NULL,0);
+(230,230,'Ia-3d','Ia -3 d1',NULL,NULL,NULL,NULL,0);
 /*!40000 ALTER TABLE `SpaceGroup` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `ProcessingPipelineCategory` DISABLE KEYS */;

diff --git a/schemas/ispyb/routines.sql b/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);