[Acknowledgements] Fix for selecting all roles (#9209)

Fix insert statement when too many roles are added by converting the fields from varchar(255) to text. Fixes #9173
aces · Apr 19, 2024 · 2167094 · 2167094
1 parent ab5caa7
commit 2167094
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/SQL/0000-00-00-schema.sql b/SQL/0000-00-00-schema.sql
@@ -2111,9 +2111,9 @@ CREATE TABLE `acknowledgements` (
   `ordering` varchar(255) DEFAULT NULL,
   `full_name` varchar(255) DEFAULT NULL,
   `citation_name` varchar(255) DEFAULT NULL,
-  `affiliations` varchar(255) DEFAULT NULL,
-  `degrees` varchar(255) DEFAULT NULL,
-  `roles` varchar(255) DEFAULT NULL,
+  `affiliations` text DEFAULT NULL,
+  `degrees` text DEFAULT NULL,
+  `roles` text DEFAULT NULL,
   `start_date` date DEFAULT NULL,
   `end_date` date DEFAULT NULL,
   `present` enum('Yes', 'No') DEFAULT NULL,

diff --git a/SQL/New_patches/2024-04-18-acknowledgements-size-constraints.sql b/SQL/New_patches/2024-04-18-acknowledgements-size-constraints.sql
@@ -0,0 +1,3 @@
+ALTER TABLE acknowledgements MODIFY affiliations TEXT DEFAULT NULL;
+ALTER TABLE acknowledgements MODIFY degrees TEXT DEFAULT NULL;
+ALTER TABLE acknowledgements MODIFY roles TEXT DEFAULT NULL;
diff --git a/modules/acknowledgements/php/acknowledgements.class.inc b/modules/acknowledgements/php/acknowledgements.class.inc
@@ -93,22 +93,22 @@ class Acknowledgements extends \NDB_Menu_Filter_Form
             if ($values['addPresent'] === 'Yes') {
                 $values['addEndDate'] = null;
             }
-            $affiliations = is_array($values['addAffiliations']) ?
+            $affils  = is_array($values['addAffiliations']) ?
                 implode(', ', $values['addAffiliations']) :
                 $values['addAffiliations'];
-            $degrees      = is_array($values['addDegrees']) ?
+            $degs    = is_array($values['addDegrees']) ?
                 implode(', ', $values['addDegrees']) :
                 $values['addDegrees'];
-            $roles        = is_array($values['addRoles']) ?
+            $roles   = is_array($values['addRoles']) ?
                 implode(', ', $values['addRoles']) :
                 $values['addRoles'];
-            $results      = [
+            $results = [
                 'ordering'      => $values['addOrdering'],
                 'full_name'     => $values['addFullName'],
                 'citation_name' => $values['addCitationName'],
-                'affiliations'  => $affiliations,
-                'degrees'       => $degrees,
-                'roles'         => $roles,
+                'affiliations'  => implode(',', array_filter(explode(',', $affils))),
+                'degrees'       => implode(',', array_filter(explode(',', $degs))),
+                'roles'         => implode(',', array_filter(explode(',', $roles))),
                 'start_date'    => $values['addStartDate'],
                 'end_date'      => $values['addEndDate'],
                 'present'       => $values['addPresent'],