From a3265a628992b1cc5b0c0ea20c529338b7ad6fee Mon Sep 17 00:00:00 2001 From: Safran Date: Thu, 13 Sep 2018 15:26:51 -0400 Subject: [PATCH 1/2] 542 rollback The CANANOLAB-542 change was creating errors so was rolled back. --- .../db-scripts/2.3.5/Update_caNanoLab25.sql | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/software/cananolab-webapp/db-scripts/2.3.5/Update_caNanoLab25.sql b/software/cananolab-webapp/db-scripts/2.3.5/Update_caNanoLab25.sql index 0ab01d8164..42c66e4df1 100644 --- a/software/cananolab-webapp/db-scripts/2.3.5/Update_caNanoLab25.sql +++ b/software/cananolab-webapp/db-scripts/2.3.5/Update_caNanoLab25.sql @@ -8,11 +8,6 @@ update other_nanomaterial_entity set type = 'silica' where type = 'Silica'; -/*CANANOLAB-542*/ -update nano_function -set other_function_type = NULL -where other_function_type in ('Adjuvant','Drug Carrier', 'Linker','other'); - /*CANANOLAB-543*/ delete from common_lookup where @@ -76,6 +71,9 @@ update publication set category = 'peer review article' where category = 'Article'; +delete from common_lookup +where name='publication' +and value = 'Article' /*CANANOLAB-544*/ delete from common_lookup From 54b0fb9922ea17523da399022bc8aaf333ec3ed5 Mon Sep 17 00:00:00 2001 From: Safran Date: Fri, 14 Sep 2018 12:33:12 -0400 Subject: [PATCH 2/2] CANANOLAB-531 query patch A few places where updates were not included. Now fixed. --- .../db-scripts/2.3.5/Update_caNanoLab25.sql | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/software/cananolab-webapp/db-scripts/2.3.5/Update_caNanoLab25.sql b/software/cananolab-webapp/db-scripts/2.3.5/Update_caNanoLab25.sql index 42c66e4df1..53a8eb40e3 100644 --- a/software/cananolab-webapp/db-scripts/2.3.5/Update_caNanoLab25.sql +++ b/software/cananolab-webapp/db-scripts/2.3.5/Update_caNanoLab25.sql @@ -54,13 +54,28 @@ update technique set type = 'spectrophotometry' where type = 'microplate reader'; +update common_lookup +set value = 'spectrophotometry' +where name = 'technique' +and value = 'microplate reader'; + update technique set type = 'imaging' where type = 'IVIS Lumina LT in Vivo Imaging System'; +update common_lookup +set value = 'imaging' +where name = 'technique' +and value = 'IVIS Lumina LT in Vivo Imaging System'; + update technique set type = 'gas sorption' where type = 'surface area'; + +update common_lookup +set value = 'gas sorption' +where name = 'technique' +and value = 'surface area'; /*CANANOLAB-547*/ Delete from common_lookup where value = 'cell exxpansion' ; @@ -73,7 +88,7 @@ where category = 'Article'; delete from common_lookup where name='publication' -and value = 'Article' +and value = 'Article'; /*CANANOLAB-544*/ delete from common_lookup @@ -107,6 +122,17 @@ where name = 'other_pc' and attribute = 'otherAssayType' and value = 'fluorescence spectrophotometry'; +update characterization +set assay_type = 'fluorescence intensity correlation analysis' +where assay_type = 'fluorescence correlation spectroscopy'; + +update common_lookup +set value = 'fluorescence intensity correlation analysis' +where name = 'other_pc' +and attribute = 'otherAssayType' +and value = 'fluorescence correlation spectroscopy'; + + update characterization set assay_type = 'surface chemistry' where assay_type = 'Fourier transform infrared spectroscopy'; @@ -165,6 +191,12 @@ update characterization set assay_type = 'chemical analysis' where assay_type = 'nuclear magnetic resonance'; +delete from common_lookup +where name = 'other_pc' +and attribute = 'otherAssayType' +and value = 'nuclear magnetic resonance'; + + update characterization set assay_type = 'photoacoustic sensing' where assay_type = 'photoacoustic spectroscopy';