Update to version 1.35.0

DiamondLightSource · Feb 28, 2023 · e9b2635 · e9b2635
1 parent fd9bf10
commit e9b2635
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -5,6 +5,19 @@ History
 Unreleased / master
 -------------------
 
+1.35.0 (2023-02-28)
+-------------------
+
+* New tables, rows and enum options for SSX (serial crystallography):
+ * Table ``SSXDataCollection``
+ * Table ``Component``
+ * Table ``SampleComposition``
+ * Table ``CrystalComposition``
+ * Table ``EventChain``
+ * Table ``EventType``
+ * Table ``Event``
+ * Rows for ``EventType``, ``ComponentType``, ``ExperimentType``
+ * Enum options in ``DataCollectionGroup.experimentType``: 'Still' (not for SSX), 'SSX-Chip', 'SSX-Jet'
 * Turn on column compression for ``PDB.contents``. (This is a slow operation which takes several minutes on a table with thousands of rows.)
 * Drop unneccessary column ``Tomogram.processingJobId``.
 
@@ -13,7 +26,6 @@ Unreleased / master
 
 * Add ``EXECUTE`` perm on procedure ``update_dc_append_comments`` to 'ispyb_processing' role.
 
-
 1.34.0 (2023-01-16)
 -------------------
 

diff --git a/bin/lookup_tables.sh b/bin/lookup_tables.sh
@@ -28,6 +28,7 @@ UserGroup
 Permission
 UserGroup_has_Permission
 ScanParametersService
+EventType
 )
 
 LOOKUP_TABLES_STRING=''

diff --git a/schemas/ispyb/data.sql b/schemas/ispyb/data.sql
@@ -521,13 +521,6 @@ INSERT INTO `EnergyScan` (`energyScanId`, `sessionId`, `blSampleId`, `fluorescen
 /*!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 */;
 

diff --git a/schemas/ispyb/lookups.sql b/schemas/ispyb/lookups.sql
@@ -10,7 +10,7 @@
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
 /*!40000 ALTER TABLE `AdminVar` DISABLE KEYS */;
-INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','1.34.1');
+INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','1.35.0');
 /*!40000 ALTER TABLE `AdminVar` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `SchemaStatus` DISABLE KEYS */;
@@ -213,7 +213,8 @@ INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `rec
 (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');
+(241,'2023_02_14_SSX_experiment.sql','DONE','2023-02-21 13:20:55'),
+(242,'2023_02_28_AdminVar_bump_version.sql','DONE','2023-02-28 16:57:44');
 /*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `ComponentType` DISABLE KEYS */;
@@ -826,6 +827,13 @@ INSERT INTO `UserGroup_has_Permission` (`userGroupId`, `permissionId`) VALUES (1
 INSERT INTO `ScanParametersService` (`scanParametersServiceId`, `name`, `description`) VALUES (4,'Temperature','Temperature in Celsius'),
 (7,'Pressure','Pressure in pascal (Pa)');
 /*!40000 ALTER TABLE `ScanParametersService` 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 */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

diff --git a/schemas/ispyb/updates/2023_02_28_AdminVar_bump_version.sql b/schemas/ispyb/updates/2023_02_28_AdminVar_bump_version.sql
@@ -0,0 +1,5 @@
+INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2023_02_28_AdminVar_bump_version.sql', 'ONGOING');
+
+UPDATE AdminVar SET `value` = '1.35.0' WHERE `name` = 'schemaVersion';
+
+UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2023_02_28_AdminVar_bump_version.sql';