diff --git a/HISTORY.rst b/HISTORY.rst index 8995ece..24833df 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,6 +5,14 @@ History Unreleased / master ------------------- +4.4.0 (2025-29-01) +------------------- + +New or modified tables and columns: + +- Add ``binnedPixelSize`` column to the ``ParticleClassificationGroup`` table +- Add ``gridSquareId`` column to the ``Tomogram`` table + 4.3.0 (2024-12-05) ------------------- diff --git a/schemas/ispyb/lookups.sql b/schemas/ispyb/lookups.sql index 2abf64a..ca7fead 100644 --- a/schemas/ispyb/lookups.sql +++ b/schemas/ispyb/lookups.sql @@ -11,7 +11,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','4.3.0'); +INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','4.4.0'); /*!40000 ALTER TABLE `AdminVar` ENABLE KEYS */; /*!40000 ALTER TABLE `SchemaStatus` DISABLE KEYS */; @@ -270,7 +270,10 @@ INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `rec (298,'2024_09_25_AutoProcProgram_processingPipelineId.sql','DONE','2024-12-05 13:27:18'), (299,'2024_10_15_BLSample_unique_index.sql','DONE','2024-12-05 13:27:18'), (300,'2024_12_04_AutoProcProgramAttachment_deleted.sql','DONE','2024-12-05 13:27:18'), -(301,'2024_12_05_AdminVar_bump_version.sql','DONE','2024-12-05 13:27:18'); +(301,'2024_12_05_AdminVar_bump_version.sql','DONE','2024-12-05 13:27:18'), +(302,'2025_01_08_ParticleClassificationGroup_binnedPixelSize.sql','DONE','2025-01-29 10:29:27'), +(303,'2025_01_24_Tomogram_gridSquare.sql','DONE','2025-01-29 10:29:27'), +(304,'2025_01_29_AdminVar_bump_version.sql','DONE','2025-01-29 10:29:27'); /*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */; /*!40000 ALTER TABLE `ComponentType` DISABLE KEYS */; diff --git a/schemas/ispyb/tables.sql b/schemas/ispyb/tables.sql index d68fca8..538b933 100644 --- a/schemas/ispyb/tables.sql +++ b/schemas/ispyb/tables.sql @@ -2409,6 +2409,7 @@ CREATE TABLE `ParticleClassificationGroup` ( `numberOfParticlesPerBatch` int(10) unsigned DEFAULT NULL COMMENT 'total number of particles per batch (a large integer)', `numberOfClassesPerBatch` int(10) unsigned DEFAULT NULL, `symmetry` varchar(20) DEFAULT NULL, + `binnedPixelSize` float DEFAULT NULL COMMENT 'Binned pixel size. Unit: Angstroms', PRIMARY KEY (`particleClassificationGroupId`), KEY `ParticleClassificationGroup_fk_particlePickerId` (`particlePickerId`), KEY `ParticleClassificationGroup_fk_programId` (`programId`), @@ -3566,11 +3567,14 @@ CREATE TABLE `Tomogram` ( `projXZ` varchar(255) DEFAULT NULL COMMENT 'XZ projection file', `recordTimeStamp` datetime DEFAULT current_timestamp() COMMENT 'Creation or last update date/time', `globalAlignmentQuality` float DEFAULT NULL COMMENT 'Quality of fit metric for the alignment of the tilt series corresponding to this tomogram', + `gridSquareId` int(11) unsigned DEFAULT NULL COMMENT 'FK, references medium mag map in GridSquare', PRIMARY KEY (`tomogramId`), KEY `Tomogram_fk_dataCollectionId` (`dataCollectionId`), KEY `Tomogram_fk_autoProcProgramId` (`autoProcProgramId`), + KEY `Tomogram_fk_gridSquareId` (`gridSquareId`), CONSTRAINT `Tomogram_fk_autoProcProgramId` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE SET NULL ON UPDATE CASCADE, - CONSTRAINT `Tomogram_fk_dataCollectionId` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `Tomogram_fk_dataCollectionId` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `Tomogram_fk_gridSquareId` FOREIGN KEY (`gridSquareId`) REFERENCES `GridSquare` (`gridSquareId`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='For storing per-sample, per-position data analysis results (reconstruction)'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `UserGroup`;