From 43f53e9925d3103aee770b7ddcbf37748eb57999 Mon Sep 17 00:00:00 2001 From: Laetitia Fesselier Date: Tue, 23 Apr 2024 12:17:46 -0400 Subject: [PATCH] data_dictionary_builder.php unique constraint fix (#9201) Only re-build instrument data dictionaries, not all data dictionaries, to ensure all names are unique. --- tools/exporters/data_dictionary_builder.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/exporters/data_dictionary_builder.php b/tools/exporters/data_dictionary_builder.php index 8ffaab279f2..ade314778a0 100755 --- a/tools/exporters/data_dictionary_builder.php +++ b/tools/exporters/data_dictionary_builder.php @@ -51,9 +51,12 @@ $instrumentParameterTypeCategoryIDs = []; $instrumentParameterTypeIDs = []; - $parameter_types = $DB->pselectColWithIndexKey( - "Select Name, ParameterTypeID from parameter_type", + "SELECT pt.Name, pt.ParameterTypeID + FROM parameter_type pt + JOIN parameter_type_category_rel ptcr USING (ParameterTypeID) + JOIN parameter_type_category ptc USING (ParameterTypeCategoryID) + WHERE ptc.Type = 'Instrument'", [], "Name" );