There are a series of changes which are agreed in the collaboration, and update scripts exist, but they dont seem to be applied to the production pydb:
-- BLSession
-- https://github.com/ispyb/ISPyB/blob/master/ispyb-ejb/db/scripts/ahead/2019_03_29_BLSession_archived.sql
ALTER TABLE BLSession
ADD archived boolean DEFAULT False
COMMENT 'The data for the session is archived and no longer available on disk';
-- DataCollectionComment
-- https://github.com/ispyb/ISPyB/blob/master/ispyb-ejb/db/scripts/passed/2017/2017_05_02_Merge_with_DLS_create.sql
-- Not in pydb.sql
DROP TABLE IF EXISTS `DataCollectionComment`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `DataCollectionComment` (
`dataCollectionCommentId` int(11) unsigned NOT NULL AUTO_INCREMENT,
`dataCollectionId` int(11) unsigned NOT NULL,
`personId` int(10) unsigned NOT NULL,
`comments` varchar(4000) DEFAULT NULL,
`createTime` timestamp NOT NULL DEFAULT current_timestamp(),
`modTime` date DEFAULT NULL,
PRIMARY KEY (`dataCollectionCommentId`),
KEY `dataCollectionComment_fk1` (`dataCollectionId`),
KEY `dataCollectionComment_fk2` (`personId`),
CONSTRAINT `dataCollectionComment_fk1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `dataCollectionComment_fk2` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
-- https://github.com/ispyb/ISPyB/blob/master/ispyb-ejb/db/scripts/passed/2017/2017_05_02_Merge_with_DLS_create.sql
-- Not in pydb.sql
DROP TABLE IF EXISTS `CourierTermsAccepted`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `CourierTermsAccepted` (
`courierTermsAcceptedId` int(10) unsigned NOT NULL AUTO_INCREMENT,
`proposalId` int(10) unsigned NOT NULL,
`personId` int(10) unsigned NOT NULL,
`shippingName` varchar(100) DEFAULT NULL,
`timestamp` datetime DEFAULT current_timestamp(),
`shippingId` int(11) unsigned DEFAULT NULL,
PRIMARY KEY (`courierTermsAcceptedId`),
KEY `CourierTermsAccepted_ibfk_1` (`proposalId`),
KEY `CourierTermsAccepted_ibfk_2` (`personId`),
KEY `CourierTermsAccepted_ibfk_3` (`shippingId`),
CONSTRAINT `CourierTermsAccepted_ibfk_1` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`),
CONSTRAINT `CourierTermsAccepted_ibfk_2` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`),
CONSTRAINT `CourierTermsAccepted_ibfk_3` FOREIGN KEY (`shippingId`) REFERENCES `Shipping` (`shippingId`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Records acceptances of the courier T and C';
/*!40101 SET character_set_client = @saved_cs_client */;
-- DewarRegistry
-- https://github.com/ispyb/ISPyB/blob/master/ispyb-ejb/db/scripts/passed/2017/2017_05_02_Merge_with_DLS_create.sql
-- Not in pydb.sql
DROP TABLE IF EXISTS `DewarRegistry`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `DewarRegistry` (
`facilityCode` varchar(20) NOT NULL,
`proposalId` int(11) unsigned NOT NULL,
`labContactId` int(11) unsigned NOT NULL,
`purchaseDate` datetime DEFAULT NULL,
`bltimestamp` datetime NOT NULL DEFAULT current_timestamp(),
PRIMARY KEY (`facilityCode`),
KEY `DewarRegistry_ibfk_1` (`proposalId`),
KEY `DewarRegistry_ibfk_2` (`labContactId`),
CONSTRAINT `DewarRegistry_ibfk_1` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`) ON DELETE CASCADE,
CONSTRAINT `DewarRegistry_ibfk_2` FOREIGN KEY (`labContactId`) REFERENCES `LabContact` (`labContactId`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
stufisher
commented
2 years ago
There are a series of changes which are agreed in the collaboration, and update scripts exist, but they dont seem to be applied to the production pydb:
https://github.com/ispyb/ISPyB/tree/master/ispyb-ejb/db/updates