Merge pull request #80 from DiamondLightSource/version_1.21

Version 1.21
DiamondLightSource · May 14, 2021 · 5f4e915 · 5f4e915
2 parents 38d00eb + 94cffa3
commit 5f4e915
Show file tree

Hide file tree

Showing 9 changed files with 1,083 additions and 23 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -5,6 +5,44 @@ History
 Unreleased / master
 -------------------
 
+1.21.0 (2021-05-14)
+-------------------
+
+* Table changes:
+
+  * The FK constraint for Dewar.firstExperimentId has been changed to `ON DELETE SET NULL ON UPDATE CASCADE`.
+  * The data type of the `ParticleClassification.rotationAccuracy` column has been changed from `int unsigned` to `float`.
+  * In `DataCollection`: Added new column `dataCollectionPlanId` with FK constraint referencing the table currently known as `DiffractionPlan`. 
+  * In `ContainerQueueSample`: Added new columns `status`, `startTime`, `endTime`, `dataCollectionPlanId` and `blSampleId` with FK constraints for the two latter ones.
+
+* New stored procedures for cryo EM:
+
+  * `upsert_particle_picker`
+  * `upsert_particle_classification_group`
+  * `upsert_particle_classification`
+  * `insert_cryoem_initial_model`
+  * Grants for these have been added to the `grants/ispyb_processing.sql` file.
+
+* New stored procedures for MX and other disciplines:
+
+  * `insert_aperture`
+  * `insert_crystal`
+  * `insert_dc_plan`
+  * `insert_position`
+  * `retrieve_apertures_using_size`
+  * `retrieve_container`
+  * `retrieve_dcs_for_sample`
+  * `retrieve_quality_indicators`
+  * `retrieve_robot_actions_for_sample`
+  * `retrieve_screenings_for_sample`
+  * `retrieve_xfe_fluo_ids_for_sample`
+  * A new role ispyb_gda_mxcx has been created with execute grants on these procedures.
+
+* Modified stored procedures:
+
+  * `retrieve_dc`: Added extra column `id` (which is an alias for the primary key).
+  * `retrieve_scm_samples_for_container_id`: Only indentation changes, no real changes.
+
 1.20.1 (2021-04-20)
 -------------------
 

diff --git a/docs/list_of_procs.rst b/docs/list_of_procs.rst
diff --git a/docs/list_of_tables_and_columns.rst b/docs/list_of_tables_and_columns.rst
@@ -1326,7 +1326,7 @@
    ``classNumber``,int,"Identified of the class. A unique ID given by Relion"
    ``classImageFullPath``,varchar,"The PNG of the class"
    ``particlesPerClass``,int,"Number of particles within the selected class, can then be used together with the total number above to calculate the percentage"
-   ``rotationAccuracy``,int,"???"
+   ``rotationAccuracy``,float,"???"
    ``translationAccuracy``,float,"Unit: Angstroms"
    ``estimatedResolution``,float,"???, Unit: Angstroms"
    ``overallFourierCompleteness``,float,""

diff --git a/grants/ispyb_acquisition.sql b/grants/ispyb_acquisition.sql
@@ -75,3 +75,18 @@ GRANT EXECUTE ON PROCEDURE upsert_dc_grid TO ispyb_gda_scm;
 GRANT EXECUTE ON PROCEDURE update_dc_position TO ispyb_gda_scm;
 GRANT EXECUTE ON PROCEDURE insert_beamline_action TO ispyb_gda_scm;
 
+CREATE ROLE IF NOT EXISTS ispyb_gda_mxcx;
+
+GRANT EXECUTE ON PROCEDURE insert_aperture TO ispyb_gda_mxcx;
+GRANT EXECUTE ON PROCEDURE insert_crystal TO ispyb_gda_mxcx;
+GRANT EXECUTE ON PROCEDURE insert_dc_plan TO ispyb_gda_mxcx;
+GRANT EXECUTE ON PROCEDURE insert_position TO ispyb_gda_mxcx;
+GRANT EXECUTE ON PROCEDURE retrieve_apertures_using_size TO ispyb_gda_mxcx;
+GRANT EXECUTE ON PROCEDURE retrieve_container TO ispyb_gda_mxcx;
+GRANT EXECUTE ON PROCEDURE retrieve_dcs_for_sample TO ispyb_gda_mxcx;
+GRANT EXECUTE ON PROCEDURE retrieve_quality_indicators TO ispyb_gda_mxcx;
+GRANT EXECUTE ON PROCEDURE retrieve_robot_actions_for_sample TO ispyb_gda_mxcx;
+GRANT EXECUTE ON PROCEDURE retrieve_screenings_for_sample TO ispyb_gda_mxcx;
+GRANT EXECUTE ON PROCEDURE retrieve_xfe_fluo_ids_for_sample TO ispyb_gda_mxcx;
+GRANT EXECUTE ON PROCEDURE retrieve_dc TO ispyb_gda_mxcx;
+
diff --git a/schemas/ispyb/lookups.sql b/schemas/ispyb/lookups.sql