Skip to content

Commit e714a2e

Browse files
gfrngfrn
committed
Add missing columns to DB
1 parent ecb290a commit e714a2e

File tree

1 file changed

+30
-25
lines changed

1 file changed

+30
-25
lines changed

‎database/data.sql‎

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,6 +1536,7 @@ CREATE TABLE `BLSession` (
15361536
`archived` tinyint(1) DEFAULT 0 COMMENT 'The data for the session is archived and no longer available on disk',
15371537
`riskRating` enum('Low','Medium','High','Not Permitted') DEFAULT NULL COMMENT 'ERA in user admin system',
15381538
`purgedProcessedData` tinyint(1) DEFAULT 0 COMMENT 'Flag to indicate whether the processed folder in the associated visit directory has been purged',
1539+
`icatId` int(11) unsigned DEFAULT NULL COMMENT 'The internal ICAT ID for this BLSession',
15391540
PRIMARY KEY (`sessionId`),
15401541
UNIQUE KEY `proposalId` (`proposalId`,`visit_number`),
15411542
KEY `Session_FKIndex2` (`beamLineSetupId`),
@@ -1556,17 +1557,17 @@ CREATE TABLE `BLSession` (
15561557
LOCK TABLES `BLSession` WRITE;
15571558
/*!40000 ALTER TABLE `BLSession` DISABLE KEYS */;
15581559
INSERT INTO `BLSession` VALUES
1559-
(9999,1,999999,1,'2016-03-11 09:00:00','2016-03-11 17:00:00','i02',NULL,NULL,'jhgjh',NULL,'2016-03-16 16:08:29',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0),
1560-
(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),
1561-
(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),
1562-
(339525,NULL,141666,NULL,'2016-03-11 09:00:00','2016-03-11 17:00:00','i03',NULL,NULL,NULL,NULL,'2016-03-16 16:08:29',1,NULL,'0000-00-00 00:00:00','3fefbfbd-5f64-5d',0,NULL,0),
1563-
(339528,NULL,141666,NULL,'2016-03-11 09:00:00','2016-03-11 17:00:00','i03',NULL,NULL,NULL,NULL,'2016-03-17 15:07:42',2,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0),
1564-
(339531,NULL,141666,NULL,'2016-03-11 09:00:00','2016-03-11 17:00:00','i03',NULL,NULL,NULL,NULL,'2016-03-17 15:08:09',3,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0),
1565-
(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),
1566-
(27464088,NULL,60858,NULL,'2022-10-21 09:00:00','2023-10-31 09:00:00','m12',0,NULL,NULL,NULL,'2021-12-14 14:51:19',5,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0),
1567-
(27464089,NULL,60858,NULL,'2022-10-21 09:00:00','2022-10-31 09:00:00','m12',0,NULL,NULL,NULL,'2021-12-14 14:51:19',6,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0),
1568-
(27464090,NULL,1000028,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-12-09 16:57:15',NULL,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0),
1569-
(27464172,NULL,1000327,NULL,NULL,NULL,'m12',NULL,NULL,NULL,NULL,'2025-04-24 10:11:06',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0);
1560+
(9999,1,999999,1,'2016-03-11 09:00:00','2016-03-11 17:00:00','i02',NULL,NULL,'jhgjh',NULL,'2016-03-16 16:08:29',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL),
1561+
(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),
1562+
(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),
1563+
(339525,NULL,141666,NULL,'2016-03-11 09:00:00','2016-03-11 17:00:00','i03',NULL,NULL,NULL,NULL,'2016-03-16 16:08:29',1,NULL,'0000-00-00 00:00:00','3fefbfbd-5f64-5d',0,NULL,0,NULL),
1564+
(339528,NULL,141666,NULL,'2016-03-11 09:00:00','2016-03-11 17:00:00','i03',NULL,NULL,NULL,NULL,'2016-03-17 15:07:42',2,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL),
1565+
(339531,NULL,141666,NULL,'2016-03-11 09:00:00','2016-03-11 17:00:00','i03',NULL,NULL,NULL,NULL,'2016-03-17 15:08:09',3,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL),
1566+
(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),
1567+
(27464088,NULL,60858,NULL,'2022-10-21 09:00:00','2023-10-31 09:00:00','m12',0,NULL,NULL,NULL,'2021-12-14 14:51:19',5,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL),
1568+
(27464089,NULL,60858,NULL,'2022-10-21 09:00:00','2022-10-31 09:00:00','m12',0,NULL,NULL,NULL,'2021-12-14 14:51:19',6,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL),
1569+
(27464090,NULL,1000028,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-12-09 16:57:15',NULL,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL),
1570+
(27464172,NULL,1000327,NULL,NULL,NULL,'m12',NULL,NULL,NULL,NULL,'2025-04-24 10:11:06',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL,0,NULL);
15701571
/*!40000 ALTER TABLE `BLSession` ENABLE KEYS */;
15711572
UNLOCK TABLES;
15721573

@@ -2552,7 +2553,7 @@ CREATE TABLE `ContainerType` (
25522553
`dropOffsetY` float DEFAULT NULL,
25532554
`wellDrop` smallint(6) DEFAULT NULL,
25542555
PRIMARY KEY (`containerTypeId`)
2555-
) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='A lookup table for different types of containers';
2556+
) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='A lookup table for different types of containers';
25562557
/*!40101 SET character_set_client = @saved_cs_client */;
25572558

25582559
--
@@ -2596,7 +2597,8 @@ INSERT INTO `ContainerType` VALUES
25962597
(32,'Box','xpdf',1,25,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
25972598
(33,'Puck-22','xpdf',1,22,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
25982599
(34,'I22_Grid_81','saxs',1,81,9,1,1,1,1,0,0,-1),
2599-
(35,'I22_Capillary_Rack_25','saxs',1,25,25,1,1,1,1,0,0,-1);
2600+
(35,'I22_Capillary_Rack_25','saxs',1,25,25,1,1,1,1,0,0,-1),
2601+
(38,'Cryo-EM Puck','mx',1,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
26002602
/*!40000 ALTER TABLE `ContainerType` ENABLE KEYS */;
26012603
UNLOCK TABLES;
26022604

@@ -3305,6 +3307,7 @@ CREATE TABLE `DewarRegistry` (
33053307
`purchaseDate` datetime DEFAULT NULL,
33063308
`bltimestamp` datetime NOT NULL DEFAULT current_timestamp(),
33073309
`manufacturerSerialNumber` varchar(15) DEFAULT NULL COMMENT 'Dewar serial number as given by manufacturer. Used to be typically 5 or 6 digits, more likely to be 11 alphanumeric chars in future',
3310+
`type` enum('Dewar','Toolbox','Thermal Shipper') NOT NULL DEFAULT 'Dewar',
33083311
PRIMARY KEY (`dewarRegistryId`),
33093312
UNIQUE KEY `facilityCode` (`facilityCode`),
33103313
KEY `DewarRegistry_ibfk_1` (`proposalId`),
@@ -3321,9 +3324,9 @@ CREATE TABLE `DewarRegistry` (
33213324
LOCK TABLES `DewarRegistry` WRITE;
33223325
/*!40000 ALTER TABLE `DewarRegistry` DISABLE KEYS */;
33233326
INSERT INTO `DewarRegistry` VALUES
3324-
(1,'DLS-EM-0000',141666,NULL,NULL,'2023-09-14 09:19:21',NULL),
3325-
(2,'DLS-EM-0001',37027,NULL,NULL,'2023-09-14 09:19:21',NULL),
3326-
(217,'DLS-EM-0002',141666,NULL,NULL,'2023-09-14 09:19:21',NULL);
3327+
(1,'DLS-EM-0000',141666,NULL,NULL,'2023-09-14 09:19:21',NULL,'Dewar'),
3328+
(2,'DLS-EM-0001',37027,NULL,NULL,'2023-09-14 09:19:21',NULL,'Dewar'),
3329+
(217,'DLS-EM-0002',141666,NULL,NULL,'2023-09-14 09:19:21',NULL,'Dewar');
33273330
/*!40000 ALTER TABLE `DewarRegistry` ENABLE KEYS */;
33283331
UNLOCK TABLES;
33293332

@@ -7798,6 +7801,8 @@ CREATE TABLE `Tomogram` (
77987801
`recordTimeStamp` datetime DEFAULT current_timestamp() COMMENT 'Creation or last update date/time',
77997802
`globalAlignmentQuality` float DEFAULT NULL COMMENT 'Quality of fit metric for the alignment of the tilt series corresponding to this tomogram',
78007803
`gridSquareId` int(11) unsigned DEFAULT NULL COMMENT 'FK, references medium mag map in GridSquare',
7804+
`pixelLocationX` int(11) DEFAULT NULL COMMENT 'pixel location of tomogram centre on search map image (x)',
7805+
`pixelLocationY` int(11) DEFAULT NULL COMMENT 'pixel location of tomogram centre on search map image (y)',
78017806
PRIMARY KEY (`tomogramId`),
78027807
KEY `Tomogram_fk_dataCollectionId` (`dataCollectionId`),
78037808
KEY `Tomogram_fk_autoProcProgramId` (`autoProcProgramId`),
@@ -7815,14 +7820,14 @@ CREATE TABLE `Tomogram` (
78157820
LOCK TABLES `Tomogram` WRITE;
78167821
/*!40000 ALTER TABLE `Tomogram` DISABLE KEYS */;
78177822
INSERT INTO `Tomogram` VALUES
7818-
(1,6017406,56986676,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack_reprocess1.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test_thumbnail.png','test_movie.png','test.png','test.png','test.png','2023-01-19 14:15:44',1.1,NULL),
7819-
(2,6017408,56986678,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL),
7820-
(3,6017409,56986678,'aligned_file_fri_aretomo.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL),
7821-
(4,6017411,56986679,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL),
7822-
(5,6017411,56986800,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL),
7823-
(6,6017408,56986676,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL),
7824-
(7,6017408,56986676,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL),
7825-
(8,6017413,56986801,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',1.2,NULL);
7823+
(1,6017406,56986676,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack_reprocess1.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test_thumbnail.png','test_movie.png','test.png','test.png','test.png','2023-01-19 14:15:44',1.1,NULL,NULL,NULL),
7824+
(2,6017408,56986678,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL,NULL,NULL),
7825+
(3,6017409,56986678,'aligned_file_fri_aretomo.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL,NULL,NULL),
7826+
(4,6017411,56986679,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL,NULL,NULL),
7827+
(5,6017411,56986800,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL,NULL,NULL),
7828+
(6,6017408,56986676,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL,NULL,NULL),
7829+
(7,6017408,56986676,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',NULL,NULL,NULL,NULL),
7830+
(8,6017413,56986801,'aligned_file_fri_aretomo.mrc','/dls/m02/data/align_output/Position_1_9_stack.mrc',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/dls','test.png','test.png','test.png','test.png','test.png','2023-01-19 14:15:44',1.2,NULL,NULL,NULL);
78267831
/*!40000 ALTER TABLE `Tomogram` ENABLE KEYS */;
78277832
UNLOCK TABLES;
78287833

@@ -8436,4 +8441,4 @@ UNLOCK TABLES;
84368441
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
84378442
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
84388443

8439-
-- Dump completed on 2025-07-09 10:39:20
8444+
-- Dump completed on 2025-07-09 10:50:48

0 commit comments

Comments
 (0)