diff --git a/HISTORY.rst b/HISTORY.rst index bd671dd..ee37612 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,6 +5,11 @@ History Unreleased / master ------------------- +1.36.1 (2023-04-17) +------------------- + +Bug fix: The file name of an update .sql file didn't correspond with the name it inserted into the ``SchemaStatus`` table. + 1.36.0 (2023-04-17) ------------------- diff --git a/schemas/ispyb/lookups.sql b/schemas/ispyb/lookups.sql index 9f071ca..c6c03f4 100644 --- a/schemas/ispyb/lookups.sql +++ b/schemas/ispyb/lookups.sql @@ -10,7 +10,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','1.36.0'); +INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','1.36.1'); /*!40000 ALTER TABLE `AdminVar` ENABLE KEYS */; /*!40000 ALTER TABLE `SchemaStatus` DISABLE KEYS */; @@ -220,7 +220,8 @@ INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `rec (245,'2023_03_27_GridInfo_micronsPerPixelXY.sql','DONE','2023-03-27 11:06:44'), (246,'2023_04_04_XrayCentring.sql','DONE','2023-04-13 17:03:59'), (247,'2023_04_14_XrayCentring.sql','DONE','2023-04-17 10:06:29'), -(248,'2023_04_17_AdminVar_bump_version.sql','DONE','2023-04-17 10:06:29'); +(248,'2023_04_17_AdminVar_bump_version.sql','DONE','2023-04-17 10:06:29'), +(249,'2023_04_17_AdminVar_bump_version_v2.sql','DONE','2023-04-17 11:27:26'); /*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */; /*!40000 ALTER TABLE `ComponentType` DISABLE KEYS */; diff --git a/schemas/ispyb/updates/2023_04_17_AdminVar_bump_version_v2.sql b/schemas/ispyb/updates/2023_04_17_AdminVar_bump_version_v2.sql new file mode 100644 index 0000000..ed59026 --- /dev/null +++ b/schemas/ispyb/updates/2023_04_17_AdminVar_bump_version_v2.sql @@ -0,0 +1,5 @@ +INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2023_04_17_AdminVar_bump_version_v2.sql', 'ONGOING'); + +UPDATE AdminVar SET `value` = '1.36.1' WHERE `name` = 'schemaVersion'; + +UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2023_04_17_AdminVar_bump_version_v2.sql';