From 87777231057d17f0672d0c91f91a790b43104bc1 Mon Sep 17 00:00:00 2001 From: Stuart Fisher Date: Thu, 6 Oct 2022 15:44:30 +0200 Subject: [PATCH 1/5] add ProcessingJob --- schema/updates/2022_10_06_ProcessingJob.sql | 44 +++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 schema/updates/2022_10_06_ProcessingJob.sql diff --git a/schema/updates/2022_10_06_ProcessingJob.sql b/schema/updates/2022_10_06_ProcessingJob.sql new file mode 100644 index 0000000..075d10a --- /dev/null +++ b/schema/updates/2022_10_06_ProcessingJob.sql @@ -0,0 +1,44 @@ +INSERT INTO SchemaStatus (ScriptName, SchemaStatus) VALUES ('2022_10_06_ProcessingJob.sql', 'ONGOING'); + +CREATE TABLE `ProcessingJob` ( + `processingJobId` int(11) unsigned NOT NULL AUTO_INCREMENT, + `dataCollectionId` int(11) unsigned DEFAULT NULL, + `displayName` varchar(80) DEFAULT NULL COMMENT 'xia2, fast_dp, dimple, etc', + `comments` varchar(255) DEFAULT NULL COMMENT 'For users to annotate the job and see the motivation for the job', + `recordTimestamp` timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'When job was submitted', + `recipe` varchar(50) DEFAULT NULL COMMENT 'What we want to run (xia, dimple, etc).', + `automatic` tinyint(1) DEFAULT NULL COMMENT 'Whether this processing job was triggered automatically or not', + PRIMARY KEY (`processingJobId`), + KEY `ProcessingJob_ibfk1` (`dataCollectionId`), + CONSTRAINT `ProcessingJob_ibfk1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='From this we get both job times and lag times'; + +CREATE TABLE `ProcessingJobImageSweep` ( + `processingJobImageSweepId` int(11) unsigned NOT NULL AUTO_INCREMENT, + `processingJobId` int(11) unsigned DEFAULT NULL, + `dataCollectionId` int(11) unsigned DEFAULT NULL, + `startImage` mediumint(8) unsigned DEFAULT NULL, + `endImage` mediumint(8) unsigned DEFAULT NULL, + PRIMARY KEY (`processingJobImageSweepId`), + KEY `ProcessingJobImageSweep_ibfk1` (`processingJobId`), + KEY `ProcessingJobImageSweep_ibfk2` (`dataCollectionId`), + CONSTRAINT `ProcessingJobImageSweep_ibfk1` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`), + CONSTRAINT `ProcessingJobImageSweep_ibfk2` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='This allows multiple sweeps per processing job for multi-xia2'; + +CREATE TABLE `ProcessingJobParameter` ( + `processingJobParameterId` int(11) unsigned NOT NULL AUTO_INCREMENT, + `processingJobId` int(11) unsigned DEFAULT NULL, + `parameterKey` varchar(80) DEFAULT NULL COMMENT 'E.g. resolution, spacegroup, pipeline', + `parameterValue` varchar(1024) DEFAULT NULL, + PRIMARY KEY (`processingJobParameterId`), + KEY `ProcessingJobParameter_ibfk1` (`processingJobId`), + CONSTRAINT `ProcessingJobParameter_ibfk1` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +ALTER TABLE `AutoProcProgram` + ADD `processingJobId` int(11) unsigned DEFAULT NULL, + KEY `AutoProcProgram_FK2` (`processingJobId`), + CONSTRAINT `AutoProcProgram_FK2` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`) + +UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2022_10_06_ProcessingJob.sql'; From 8ed229be6cb3e5f277ef09fb57dd9bb078f54f92 Mon Sep 17 00:00:00 2001 From: Stuart Fisher Date: Thu, 6 Oct 2022 15:58:45 +0200 Subject: [PATCH 2/5] add ProcessingJob --- schema/updates/2022_10_06_ProcessingJob.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/updates/2022_10_06_ProcessingJob.sql b/schema/updates/2022_10_06_ProcessingJob.sql index 075d10a..db018f8 100644 --- a/schema/updates/2022_10_06_ProcessingJob.sql +++ b/schema/updates/2022_10_06_ProcessingJob.sql @@ -1,4 +1,4 @@ -INSERT INTO SchemaStatus (ScriptName, SchemaStatus) VALUES ('2022_10_06_ProcessingJob.sql', 'ONGOING'); +INSERT INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2022_10_06_ProcessingJob.sql', 'ONGOING'); CREATE TABLE `ProcessingJob` ( `processingJobId` int(11) unsigned NOT NULL AUTO_INCREMENT, From 811e425269503e75ed475608959cf7da82e65e68 Mon Sep 17 00:00:00 2001 From: Stuart Fisher Date: Thu, 6 Oct 2022 16:17:43 +0200 Subject: [PATCH 3/5] add ProcessingJob --- schema/updates/2022_10_06_ProcessingJob.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schema/updates/2022_10_06_ProcessingJob.sql b/schema/updates/2022_10_06_ProcessingJob.sql index db018f8..c0d5d7d 100644 --- a/schema/updates/2022_10_06_ProcessingJob.sql +++ b/schema/updates/2022_10_06_ProcessingJob.sql @@ -37,8 +37,8 @@ CREATE TABLE `ProcessingJobParameter` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1; ALTER TABLE `AutoProcProgram` - ADD `processingJobId` int(11) unsigned DEFAULT NULL, - KEY `AutoProcProgram_FK2` (`processingJobId`), - CONSTRAINT `AutoProcProgram_FK2` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`) + ADD `processingJobId` int(11) unsigned DEFAULT NULL + KEY `AutoProcProgram_FK2` (`processingJobId`) + CONSTRAINT `AutoProcProgram_FK2` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`); UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2022_10_06_ProcessingJob.sql'; From 3237d240317cf1a1f3b0cb0bf7a130be3d483c0b Mon Sep 17 00:00:00 2001 From: Stuart Fisher Date: Thu, 6 Oct 2022 16:39:51 +0200 Subject: [PATCH 4/5] add ProcessingJob --- schema/updates/2022_10_06_ProcessingJob.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/updates/2022_10_06_ProcessingJob.sql b/schema/updates/2022_10_06_ProcessingJob.sql index c0d5d7d..4822953 100644 --- a/schema/updates/2022_10_06_ProcessingJob.sql +++ b/schema/updates/2022_10_06_ProcessingJob.sql @@ -37,8 +37,8 @@ CREATE TABLE `ProcessingJobParameter` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1; ALTER TABLE `AutoProcProgram` - ADD `processingJobId` int(11) unsigned DEFAULT NULL - KEY `AutoProcProgram_FK2` (`processingJobId`) + ADD `processingJobId` int(11) unsigned DEFAULT NULL, + KEY `AutoProcProgram_FK2` (`processingJobId`), CONSTRAINT `AutoProcProgram_FK2` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`); UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2022_10_06_ProcessingJob.sql'; From a92536de2e8412e5346b2318c29457781fb1626c Mon Sep 17 00:00:00 2001 From: Stuart Fisher Date: Thu, 6 Oct 2022 16:42:28 +0200 Subject: [PATCH 5/5] add ProcessingJob --- schema/updates/2022_10_06_ProcessingJob.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/updates/2022_10_06_ProcessingJob.sql b/schema/updates/2022_10_06_ProcessingJob.sql index 4822953..452dfd2 100644 --- a/schema/updates/2022_10_06_ProcessingJob.sql +++ b/schema/updates/2022_10_06_ProcessingJob.sql @@ -38,7 +38,7 @@ CREATE TABLE `ProcessingJobParameter` ( ALTER TABLE `AutoProcProgram` ADD `processingJobId` int(11) unsigned DEFAULT NULL, - KEY `AutoProcProgram_FK2` (`processingJobId`), - CONSTRAINT `AutoProcProgram_FK2` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`); + ADD KEY `AutoProcProgram_FK2` (`processingJobId`), + ADD CONSTRAINT `AutoProcProgram_FK2` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`); UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2022_10_06_ProcessingJob.sql';