Skip to content

Commit

Permalink
Bump to version 1.32.0, update history and refresh schema files
Browse files Browse the repository at this point in the history
  • Loading branch information
KarlLevik committed Aug 25, 2022
1 parent 82ca784 commit 6afba93
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 12 deletions.
11 changes: 11 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
-------------------

Expand Down
5 changes: 3 additions & 2 deletions schemas/ispyb/lookups.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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 */;
Expand Down Expand Up @@ -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 */;
Expand Down
20 changes: 10 additions & 10 deletions schemas/ispyb/routines.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions schemas/ispyb/updates/2022_08_25_AdminVar_bump_version.sql
Original file line number Diff line number Diff line change
@@ -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';

0 comments on commit 6afba93

Please sign in to comment.