Merge pull request #9 from DiamondLightSource/v_run_fixes

Drop view v_run, add more runs to table v_run, bump up version
DiamondLightSource · Apr 23, 2019 · 29d466e · 29d466e
2 parents e4e3810 + e309484
commit 29d466e
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 41 deletions.
diff --git a/schema/data.sql b/schema/data.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.17 Distrib 10.3.13-MariaDB, for Linux (x86_64)
+-- MySQL dump 10.17 Distrib 10.3.14-MariaDB, for Linux (x86_64)
 --
 -- Host: localhost Database: ispyb_build
 -- ------------------------------------------------------
--- Server version 10.3.13-MariaDB
+-- Server version 10.3.14-MariaDB
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1755,6 +1755,16 @@ LOCK TABLES `XrayCentringResult` WRITE;
 /*!40000 ALTER TABLE `XrayCentringResult` DISABLE KEYS */;
 /*!40000 ALTER TABLE `XrayCentringResult` ENABLE KEYS */;
 UNLOCK TABLES;
+
+--
+-- Dumping data for table `v_run`
+--
+
+LOCK TABLES `v_run` WRITE;
+/*!40000 ALTER TABLE `v_run` DISABLE KEYS */;
+INSERT INTO `v_run` (`runId`, `run`, `startDate`, `endDate`) VALUES (1,'2008-01','2007-12-17 09:00:00','2008-02-09 08:59:59'),(2,'2008-02','2008-02-09 09:00:00','2008-03-14 08:59:59'),(3,'2008-03','2008-03-14 09:00:00','2008-04-28 08:59:59'),(4,'2008-04','2008-04-28 09:00:00','2008-05-30 08:59:59'),(5,'2008-05','2008-05-30 09:00:00','2008-07-12 08:59:59'),(6,'2008-06','2008-07-12 09:00:00','2008-08-15 08:59:59'),(7,'2008-07','2008-08-15 09:00:00','2008-09-27 08:59:59'),(8,'2008-08','2008-09-27 09:00:00','2008-10-31 08:59:59'),(9,'2008-09','2008-10-31 09:00:00','2008-12-19 08:59:59'),(10,'2009-01','2008-12-19 09:00:00','2009-02-09 08:59:59'),(11,'2009-02','2009-02-09 09:00:00','2009-03-13 08:59:59'),(12,'2009-03','2009-03-13 09:00:00','2009-04-25 08:59:59'),(13,'2009-04','2009-04-25 09:00:00','2009-05-29 08:59:59'),(14,'2009-05','2009-05-29 09:00:00','2009-07-18 08:59:59'),(15,'2009-06','2009-07-18 09:00:00','2009-08-14 08:59:59'),(16,'2009-07','2009-08-14 09:00:00','2009-09-29 08:59:59'),(17,'2009-08','2009-09-29 09:00:00','2009-10-30 08:59:59'),(18,'2009-09','2009-10-30 09:00:00','2009-12-18 08:59:59'),(19,'2010-01','2009-12-18 09:00:00','2010-02-08 08:59:59'),(20,'2010-02','2010-02-08 09:00:00','2010-03-15 08:59:59'),(21,'2010-03','2010-03-15 09:00:00','2010-06-01 08:59:59'),(22,'2010-04','2010-06-01 09:00:00','2010-08-13 08:59:59'),(23,'2010-05','2010-08-13 09:00:00','2010-11-01 08:59:59'),(24,'2010-06','2010-11-01 09:00:00','2010-12-23 08:59:59'),(25,'2011-01','2010-12-23 09:00:00','2011-03-04 08:59:59'),(26,'2011-02','2011-03-04 09:00:00','2011-06-03 08:59:59'),(27,'2011-03','2011-06-03 09:00:00','2011-08-12 08:59:59'),(28,'2011-04','2011-08-12 09:00:00','2011-11-07 08:59:59'),(29,'2011-05','2011-11-07 09:00:00','2011-12-22 08:59:59'),(30,'2012-01','2011-12-22 09:00:00','2012-03-26 08:59:59'),(31,'2012-02','2012-03-26 09:00:00','2012-06-01 08:59:59'),(32,'2012-03','2012-06-01 09:00:00','2012-08-17 08:59:59'),(33,'2012-04','2012-08-17 09:00:00','2012-11-02 08:59:59'),(34,'2012-05','2012-11-02 09:00:00','2012-12-21 08:59:59'),(35,'2013-01','2012-12-21 09:00:00','2013-03-22 08:59:59'),(36,'2013-02','2013-03-22 09:00:00','2013-05-31 08:59:59'),(37,'2013-03','2013-05-31 09:00:00','2013-08-16 08:59:59'),(38,'2013-04','2013-08-16 09:00:00','2013-11-01 08:59:59'),(39,'2013-05','2013-11-01 09:00:00','2013-12-20 08:59:59'),(40,'2014-01','2013-12-20 09:00:00','2014-03-14 08:59:59'),(41,'2014-02','2014-03-14 09:00:00','2014-05-30 08:59:59'),(42,'2014-03','2014-05-30 09:00:00','2014-08-15 08:59:59'),(43,'2014-04','2014-08-15 09:00:00','2014-10-24 08:59:59'),(44,'2014-05','2014-10-24 09:00:00','2014-12-19 08:59:59'),(45,'2015-01','2014-12-19 09:00:00','2015-03-13 08:59:59'),(46,'2015-02','2015-03-13 09:00:00','2015-05-29 08:59:59'),(47,'2015-03','2015-05-29 09:00:00','2015-08-14 08:59:59'),(48,'2015-04','2015-08-14 09:00:00','2015-10-23 08:59:59'),(49,'2015-05','2015-10-23 09:00:00','2015-12-18 08:59:59'),(50,'2016-01','2015-12-18 09:00:00','2016-03-11 08:59:59'),(51,'2016-02','2016-03-11 09:00:00','2016-05-20 08:59:59'),(52,'2016-03','2016-05-20 09:00:00','2016-08-12 08:59:59'),(53,'2016-04','2016-08-12 09:00:00','2016-10-07 08:59:59'),(54,'2016-05','2016-10-07 09:00:00','2016-12-20 08:59:59'),(55,'2017-01','2016-12-20 09:00:00','2017-03-17 08:59:59'),(56,'2017-02','2017-03-17 09:00:00','2017-05-26 08:59:59'),(57,'2017-03','2017-05-26 09:00:00','2017-08-11 08:59:59'),(58,'2017-04','2017-08-11 09:00:00','2017-10-27 08:59:59'),(59,'2017-05','2017-10-27 09:00:00','2017-12-19 08:59:59'),(60,'2018-01','2017-12-19 09:00:00','2018-03-16 08:59:59'),(61,'2018-02','2018-03-16 09:00:00','2018-05-24 08:59:59'),(62,'2018-03','2018-05-24 09:00:00','2018-08-10 08:59:59'),(63,'2018-04','2018-08-10 09:00:00','2018-10-26 08:59:59'),(64,'2018-05','2018-10-26 09:00:00','2018-12-18 08:59:59'),(65,'2019-01','2018-12-18 09:00:00','2019-03-08 08:59:59'),(66,'2019-02','2019-03-08 09:00:00','2019-05-23 08:59:59'),(67,'2019-03','2019-05-23 09:00:00','2019-08-09 08:59:59');
+/*!40000 ALTER TABLE `v_run` ENABLE KEYS */;
+UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1764,4 +1774,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2019-04-03 16:47:22
+-- Dump completed on 2019-04-23 11:38:32
diff --git a/schema/lookups.sql b/schema/lookups.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.17 Distrib 10.3.13-MariaDB, for Linux (x86_64)
+-- MySQL dump 10.17 Distrib 10.3.14-MariaDB, for Linux (x86_64)
 --
 -- Host: localhost Database: ispyb_build
 -- ------------------------------------------------------
--- Server version 10.3.13-MariaDB
+-- Server version 10.3.14-MariaDB
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -20,7 +20,7 @@
 
 LOCK TABLES `AdminVar` WRITE;
 /*!40000 ALTER TABLE `AdminVar` DISABLE KEYS */;
-INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','1.3.0');
+INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','1.4.0');
 /*!40000 ALTER TABLE `AdminVar` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -30,7 +30,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `SchemaStatus` WRITE;
 /*!40000 ALTER TABLE `SchemaStatus` DISABLE KEYS */;
-INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `recordTimeStamp`) VALUES (6,'20180213_BLSample_subLocation.sql','DONE','2018-02-13 13:27:19'),(12,'20180213_DataCollectionFileAttachment_fileType.sql','DONE','2018-02-13 15:12:54'),(16,'20180303_v_run_to_table.sql','DONE','2018-07-25 15:11:18'),(19,'20180328_ImageQualityIndicators_alter_table.sql','DONE','2018-07-25 15:11:18'),(22,'20180410_BeamLineSetup_alter.sql','DONE','2018-07-25 15:11:18'),(25,'20180413_BeamLineSetup_and_Detector_alter.sql','DONE','2018-07-25 15:11:18'),(28,'20180501_DataCollectionGroup_experimentType_enum.sql','DONE','2018-07-25 15:11:18'),(31,'20180531_ScreeningOutput_alignmentSuccess.sql','DONE','2018-07-25 15:11:18'),(34,'20180629_DataCollection_imageContainerSubPath.sql','DONE','2018-07-25 15:11:18'),(35,'20180913_BeamCalendar.sql','DONE','2018-09-19 09:52:45'),(36,'2018_09_19_DataCollection_imageDirectory_comment.sql','DONE','2018-09-19 12:38:01'),(37,'2018_09_27_increase_schema_version.sql','DONE','2018-09-27 13:17:15'),(38,'2018_11_01_XrayCenteringResult.sql','DONE','2018-11-01 13:36:53'),(39,'2018_11_01_AutoProcProgram_dataCollectionId.sql','DONE','2018-11-01 15:10:38'),(40,'2018_11_01_AutoProcProgramMessage.sql','DONE','2018-11-01 15:28:17'),(44,'2018_11_01_DiffractionPlan_centeringMethod.sql','DONE','2018-11-01 22:51:36'),(45,'2018_11_02_DataCollectionGroup_experimentType_enum.sql','DONE','2018-11-02 11:54:15'),(47,'2018_11_05_spelling_of_centring.sql','DONE','2018-11-05 15:31:38'),(48,'2018_11_09_AutoProcProgram_update_processing_program.sql','DONE','2018-11-09 16:38:34'),(49,'2018_11_14_AutoProcProgramMessage_autoinc.sql','DONE','2018-11-14 10:15:27'),(50,'2018_11_22_AutoProcProgram_processingStatus_update.sql','DONE','2018-11-22 16:11:15'),(51,'2018_12_04_EnergyScan_and_XFEFluorescenceSpectrum_add_axisPosition.sql','DONE','2018-12-04 14:13:23'),(52,'2018_12_20_DataCollectionGroup_scanParameters.sql','DONE','2018-12-20 17:30:04'),(53,'2019_01_14_Proposal_state.sql','DONE','2019-01-14 12:13:31'),(54,'2019_01_14_ProcessingJobParameter_parameterValue.sql','DONE','2019-01-14 14:00:02'),(57,'2019_01_15_Detector_localName.sql','DONE','2019-01-15 23:01:15'),(58,'2019_02_04_BLSession_unique_index.sql','DONE','2019-02-04 13:52:19'),(59,'2019_03_29_BLSession_archived.sql','DONE','2019-04-03 14:43:08'),(60,'2019_04_03_UserGroup_and_Permission.sql','DONE','2019-04-03 14:51:04'),(61,'2019_04_07_AdminVar_bump_version.sql','DONE','2019-04-07 11:35:06'),(62,'2019_04_08_AdminVar_bump_version.sql','DONE','2019-04-08 15:38:01');
+INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `recordTimeStamp`) VALUES (6,'20180213_BLSample_subLocation.sql','DONE','2018-02-13 13:27:19'),(12,'20180213_DataCollectionFileAttachment_fileType.sql','DONE','2018-02-13 15:12:54'),(16,'20180303_v_run_to_table.sql','DONE','2018-07-25 15:11:18'),(19,'20180328_ImageQualityIndicators_alter_table.sql','DONE','2018-07-25 15:11:18'),(22,'20180410_BeamLineSetup_alter.sql','DONE','2018-07-25 15:11:18'),(25,'20180413_BeamLineSetup_and_Detector_alter.sql','DONE','2018-07-25 15:11:18'),(28,'20180501_DataCollectionGroup_experimentType_enum.sql','DONE','2018-07-25 15:11:18'),(31,'20180531_ScreeningOutput_alignmentSuccess.sql','DONE','2018-07-25 15:11:18'),(34,'20180629_DataCollection_imageContainerSubPath.sql','DONE','2018-07-25 15:11:18'),(35,'20180913_BeamCalendar.sql','DONE','2018-09-19 09:52:45'),(36,'2018_09_19_DataCollection_imageDirectory_comment.sql','DONE','2018-09-19 12:38:01'),(37,'2018_09_27_increase_schema_version.sql','DONE','2018-09-27 13:17:15'),(38,'2018_11_01_XrayCenteringResult.sql','DONE','2018-11-01 13:36:53'),(39,'2018_11_01_AutoProcProgram_dataCollectionId.sql','DONE','2018-11-01 15:10:38'),(40,'2018_11_01_AutoProcProgramMessage.sql','DONE','2018-11-01 15:28:17'),(44,'2018_11_01_DiffractionPlan_centeringMethod.sql','DONE','2018-11-01 22:51:36'),(45,'2018_11_02_DataCollectionGroup_experimentType_enum.sql','DONE','2018-11-02 11:54:15'),(47,'2018_11_05_spelling_of_centring.sql','DONE','2018-11-05 15:31:38'),(48,'2018_11_09_AutoProcProgram_update_processing_program.sql','DONE','2018-11-09 16:38:34'),(49,'2018_11_14_AutoProcProgramMessage_autoinc.sql','DONE','2018-11-14 10:15:27'),(50,'2018_11_22_AutoProcProgram_processingStatus_update.sql','DONE','2018-11-22 16:11:15'),(51,'2018_12_04_EnergyScan_and_XFEFluorescenceSpectrum_add_axisPosition.sql','DONE','2018-12-04 14:13:23'),(52,'2018_12_20_DataCollectionGroup_scanParameters.sql','DONE','2018-12-20 17:30:04'),(53,'2019_01_14_Proposal_state.sql','DONE','2019-01-14 12:13:31'),(54,'2019_01_14_ProcessingJobParameter_parameterValue.sql','DONE','2019-01-14 14:00:02'),(57,'2019_01_15_Detector_localName.sql','DONE','2019-01-15 23:01:15'),(58,'2019_02_04_BLSession_unique_index.sql','DONE','2019-02-04 13:52:19'),(59,'2019_03_29_BLSession_archived.sql','DONE','2019-04-03 14:43:08'),(60,'2019_04_03_UserGroup_and_Permission.sql','DONE','2019-04-03 14:51:04'),(61,'2019_04_07_AdminVar_bump_version.sql','DONE','2019-04-07 11:35:06'),(62,'2019_04_08_AdminVar_bump_version.sql','DONE','2019-04-08 15:38:01'),(63,'2019_04_23_AdminVar_bump_version.sql','DONE','2019-04-23 11:13:27'),(64,'2019_04_23_drop_v_run_view.sql','DONE','2019-04-23 11:13:35'),(67,'2019_04_23_v_run_additional_runs.sql','DONE','2019-04-23 12:39:47');
 /*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -195,4 +195,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2019-04-08 16:38:18
+-- Dump completed on 2019-04-23 13:40:57