From 6afba936acb24453c790efaa1474a61a890f9576 Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Thu, 25 Aug 2022 16:59:22 +0100 Subject: [PATCH] Bump to version 1.32.0, update history and refresh schema files --- HISTORY.rst | 11 ++++++++++ schemas/ispyb/lookups.sql | 5 +++-- schemas/ispyb/routines.sql | 20 +++++++++---------- .../2022_08_25_AdminVar_bump_version.sql | 5 +++++ 4 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 schemas/ispyb/updates/2022_08_25_AdminVar_bump_version.sql diff --git a/HISTORY.rst b/HISTORY.rst index f73036d7..1cc2d590 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,6 +5,17 @@ History Unreleased / master ------------------- +1.32.0 (2022-08-25) +------------------- + +* More grants files with new roles +* Stored procedure: Changed datatype from float to double for parameter ``p_flux`` in ``upsert_dc`` +* Tables and columns: + * ``DiffractionPlan``: Add JSON column ``scanParameters`` + * ``GridInfo``: Add columns patchesX and patchesY + * New table ``BLSampleImage_has_Positioner`` linking ``BLSampleImage`` and ``Positioner`` + + 1.31.0 (2022-08-08) ------------------- diff --git a/schemas/ispyb/lookups.sql b/schemas/ispyb/lookups.sql index eb5d036c..e290297f 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.31.0'); +INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','1.32.0'); /*!40000 ALTER TABLE `AdminVar` ENABLE KEYS */; /*!40000 ALTER TABLE `SchemaStatus` DISABLE KEYS */; @@ -200,7 +200,8 @@ INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `rec (225,'2022_08_08_AdminVar_bump_version.sql','DONE','2022-08-08 16:40:14'), (226,'2022_06_28_diffractionplan_scanparameters.sql','DONE','2022-08-22 11:57:56'), (227,'2022_06_28_gridinfo_patches.sql','DONE','2022-08-22 11:57:56'), -(228,'2022_06_28_sampleimage_positioner.sql','DONE','2022-08-22 11:57:56'); +(228,'2022_06_28_sampleimage_positioner.sql','DONE','2022-08-22 11:57:56'), +(229,'2022_08_25_AdminVar_bump_version.sql','DONE','2022-08-25 15:55:14'); /*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */; /*!40000 ALTER TABLE `ComponentType` DISABLE KEYS */; diff --git a/schemas/ispyb/routines.sql b/schemas/ispyb/routines.sql index c4ea1eff..44f0c6bc 100644 --- a/schemas/ispyb/routines.sql +++ b/schemas/ispyb/routines.sql @@ -8584,22 +8584,22 @@ CREATE PROCEDURE `upsert_dc`( p_focalSpotSizeAtSampleX float, p_focalSpotSizeAtSampleY float, p_polarisation float, - p_flux float, + p_flux double, p_processedDataFile varchar(255), p_datFullPath varchar(255), p_magnification int(11), p_totalAbsorbedDose float, - p_binning tinyint(1), - p_particleDiameter float, + p_binning tinyint(1), + p_particleDiameter float, p_boxSize_CTF float, - p_minResolution float, - p_minDefocus float, - p_maxDefocus float, - p_defocusStepSize float, - p_amountAstigmatism float, - p_extractSize float, - p_bgRadius float, + p_minResolution float, + p_minDefocus float, + p_maxDefocus float, + p_defocusStepSize float, + p_amountAstigmatism float, + p_extractSize float, + p_bgRadius float, p_voltage float, p_objAperture float, p_c1aperture float, diff --git a/schemas/ispyb/updates/2022_08_25_AdminVar_bump_version.sql b/schemas/ispyb/updates/2022_08_25_AdminVar_bump_version.sql new file mode 100644 index 00000000..edb6dfaf --- /dev/null +++ b/schemas/ispyb/updates/2022_08_25_AdminVar_bump_version.sql @@ -0,0 +1,5 @@ +INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2022_08_25_AdminVar_bump_version.sql', 'ONGOING'); + +UPDATE AdminVar SET `value` = '1.32.0' WHERE `name` = 'schemaVersion'; + +UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2022_08_25_AdminVar_bump_version.sql';