Skip to content

Commit d2b518e

Browse files
gfrngfrn
committed
Preparations for release 4.8.0
1 parent 947a0ee commit d2b518e

File tree

2 files changed

+30
-13
lines changed

2 files changed

+30
-13
lines changed

‎schemas/ispyb/data.sql

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,9 @@ INSERT INTO `BLSampleImageScore` (`blSampleImageScoreId`, `name`, `score`, `colo
256256
/*!40000 ALTER TABLE `BLSampleImage_has_Positioner` DISABLE KEYS */;
257257
/*!40000 ALTER TABLE `BLSampleImage_has_Positioner` ENABLE KEYS */;
258258

259+
/*!40000 ALTER TABLE `BLSamplePosition` DISABLE KEYS */;
260+
/*!40000 ALTER TABLE `BLSamplePosition` ENABLE KEYS */;
261+
259262
/*!40000 ALTER TABLE `BLSampleType_has_Component` DISABLE KEYS */;
260263
/*!40000 ALTER TABLE `BLSampleType_has_Component` ENABLE KEYS */;
261264

@@ -267,16 +270,19 @@ INSERT INTO `BLSample_has_DataCollectionPlan` (`blSampleId`, `dataCollectionPlan
267270
/*!40000 ALTER TABLE `BLSample_has_EnergyScan` DISABLE KEYS */;
268271
/*!40000 ALTER TABLE `BLSample_has_EnergyScan` ENABLE KEYS */;
269272

273+
/*!40000 ALTER TABLE `BLSample_has_Ligand` DISABLE KEYS */;
274+
/*!40000 ALTER TABLE `BLSample_has_Ligand` ENABLE KEYS */;
275+
270276
/*!40000 ALTER TABLE `BLSample_has_Positioner` DISABLE KEYS */;
271277
/*!40000 ALTER TABLE `BLSample_has_Positioner` ENABLE KEYS */;
272278

273279
/*!40000 ALTER TABLE `BLSession` DISABLE KEYS */;
274-
INSERT INTO `BLSession` (`sessionId`, `beamLineSetupId`, `proposalId`, `beamCalendarId`, `startDate`, `endDate`, `beamLineName`, `scheduled`, `nbShifts`, `comments`, `beamLineOperator`, `bltimeStamp`, `visit_number`, `usedFlag`, `lastUpdate`, `externalId`, `archived`, `riskRating`) VALUES (55167,1,37027,NULL,'2016-01-01 09:00:00','2016-01-01 17:00:00','i03',NULL,NULL,'ghfg',NULL,'2015-12-21 15:20:43',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL),
275-
(55168,1,37027,NULL,'2016-03-11 09:00:00','2016-03-11 17:00:00','i03',NULL,NULL,'jhgjh',NULL,'2015-12-21 15:20:44',2,NULL,'0000-00-00 00:00:00',NULL,0,NULL),
276-
(339525,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-16 16:08:29',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL),
277-
(339528,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-17 15:07:42',2,NULL,'0000-00-00 00:00:00',NULL,0,NULL),
278-
(339531,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-17 15:08:09',3,NULL,'0000-00-00 00:00:00',NULL,0,NULL),
279-
(339535,NULL,37027,NULL,'2018-03-27 09:00:00','2018-07-27 09:00:00','i02-2',NULL,NULL,NULL,NULL,'2018-04-05 15:48:37',99,NULL,'0000-00-00 00:00:00',NULL,0,NULL);
280+
INSERT INTO `BLSession` (`sessionId`, `beamLineSetupId`, `proposalId`, `beamCalendarId`, `startDate`, `endDate`, `beamLineName`, `scheduled`, `nbShifts`, `comments`, `beamLineOperator`, `bltimeStamp`, `visit_number`, `usedFlag`, `lastUpdate`, `externalId`, `archived`, `riskRating`, `purgedProcessedData`, `icatId`) VALUES (55167,1,37027,NULL,'2016-01-01 09:00:00','2016-01-01 17:00:00','i03',NULL,NULL,'ghfg',NULL,'2015-12-21 15:20:43',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL),
281+
(55168,1,37027,NULL,'2016-03-11 09:00:00','2016-03-11 17:00:00','i03',NULL,NULL,'jhgjh',NULL,'2015-12-21 15:20:44',2,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL),
282+
(339525,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-16 16:08:29',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL),
283+
(339528,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-17 15:07:42',2,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL),
284+
(339531,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-17 15:08:09',3,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL),
285+
(339535,NULL,37027,NULL,'2018-03-27 09:00:00','2018-07-27 09:00:00','i02-2',NULL,NULL,NULL,NULL,'2018-04-05 15:48:37',99,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL);
280286
/*!40000 ALTER TABLE `BLSession` ENABLE KEYS */;
281287

282288
/*!40000 ALTER TABLE `BLSession_has_SCPosition` DISABLE KEYS */;
@@ -435,13 +441,13 @@ INSERT INTO `DataCollectionPlan_has_Detector` (`dataCollectionPlanHasDetectorId`
435441
/*!40000 ALTER TABLE `DataCollectionPlan_has_Detector` ENABLE KEYS */;
436442

437443
/*!40000 ALTER TABLE `Dewar` DISABLE KEYS */;
438-
INSERT INTO `Dewar` (`dewarId`, `shippingId`, `code`, `comments`, `storageLocation`, `dewarStatus`, `bltimeStamp`, `isStorageDewar`, `barCode`, `firstExperimentId`, `customsValue`, `transportValue`, `trackingNumberToSynchrotron`, `trackingNumberFromSynchrotron`, `type`, `facilityCode`, `weight`, `deliveryAgent_barcode`, `extra`, `source`, `externalShippingIdFromSynchrotron`) VALUES (573,474,'Dewar-1-cm0001-1',NULL,NULL,'processing',NULL,0,'dewar-cm0001-1-0000001',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),
439-
(576,474,'Dewar-2-cm0001-1',NULL,NULL,'at DLS',NULL,0,'dewar-cm0001-1-0000002',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),
440-
(579,477,'Dewar-3-cm0001-2',NULL,NULL,'processing',NULL,0,'dewar-cm0001-2-0000477',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),
441-
(582,480,'Dewar-4-cm0001-3',NULL,NULL,'processing',NULL,0,'dewar-cm0001-3-0000480',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),
442-
(8287,6988,'Default Dewar:cm14451-1',NULL,NULL,'processing',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),
443-
(8572,7227,'cm14451-2_Dewar1',NULL,NULL,'processing','2016-02-10 13:03:07',0,NULL,NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),
444-
(8578,7231,'Dewar_1',NULL,NULL,'opened',NULL,0,'cm14451-12345',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL);
444+
INSERT INTO `Dewar` (`dewarId`, `shippingId`, `code`, `comments`, `storageLocation`, `dewarStatus`, `bltimeStamp`, `isStorageDewar`, `barCode`, `firstExperimentId`, `customsValue`, `transportValue`, `trackingNumberToSynchrotron`, `trackingNumberFromSynchrotron`, `type`, `facilityCode`, `weight`, `deliveryAgent_barcode`, `extra`, `source`, `externalShippingIdFromSynchrotron`, `dewarRegistryId`) VALUES (573,474,'Dewar-1-cm0001-1',NULL,NULL,'processing',NULL,0,'dewar-cm0001-1-0000001',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL,NULL),
445+
(576,474,'Dewar-2-cm0001-1',NULL,NULL,'at DLS',NULL,0,'dewar-cm0001-1-0000002',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL,NULL),
446+
(579,477,'Dewar-3-cm0001-2',NULL,NULL,'processing',NULL,0,'dewar-cm0001-2-0000477',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL,NULL),
447+
(582,480,'Dewar-4-cm0001-3',NULL,NULL,'processing',NULL,0,'dewar-cm0001-3-0000480',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL,NULL),
448+
(8287,6988,'Default Dewar:cm14451-1',NULL,NULL,'processing',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL,NULL),
449+
(8572,7227,'cm14451-2_Dewar1',NULL,NULL,'processing','2016-02-10 13:03:07',0,NULL,NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL,NULL),
450+
(8578,7231,'Dewar_1',NULL,NULL,'opened',NULL,0,'cm14451-12345',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL,NULL);
445451
/*!40000 ALTER TABLE `Dewar` ENABLE KEYS */;
446452

447453
/*!40000 ALTER TABLE `DewarLocation` DISABLE KEYS */;
@@ -554,6 +560,12 @@ INSERT INTO `ImageQualityIndicators` (`dataCollectionId`, `imageNumber`, `imageI
554560
/*!40000 ALTER TABLE `Laboratory` DISABLE KEYS */;
555561
/*!40000 ALTER TABLE `Laboratory` ENABLE KEYS */;
556562

563+
/*!40000 ALTER TABLE `Ligand` DISABLE KEYS */;
564+
/*!40000 ALTER TABLE `Ligand` ENABLE KEYS */;
565+
566+
/*!40000 ALTER TABLE `Ligand_has_PDB` DISABLE KEYS */;
567+
/*!40000 ALTER TABLE `Ligand_has_PDB` ENABLE KEYS */;
568+
557569
/*!40000 ALTER TABLE `MXMRRun` DISABLE KEYS */;
558570
INSERT INTO `MXMRRun` (`mxMRRunId`, `autoProcScalingId`, `rValueStart`, `rValueEnd`, `rFreeValueStart`, `rFreeValueEnd`, `LLG`, `TFZ`, `spaceGroup`, `autoProcProgramId`) VALUES (672897,603470,0.1812,0.1682,0.1896,0.1888,NULL,NULL,NULL,56986674),
559571
(672900,603470,NULL,NULL,NULL,NULL,NULL,NULL,NULL,56986675);

‎schemas/ispyb/updates/2025_07_17_AdminVar_bump_version.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2025_17_07_AdminVar_bump_version.sql', 'ONGOING');
2+
3+
UPDATE AdminVar SET `value` = '4.8.0' WHERE `name` = 'schemaVersion';
4+
5+
UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2025_17_07_AdminVar_bump_version.sql';

0 commit comments

Comments
 (0)