Export PRIMARY fields Fails on CiviCRM 5.40.2 and MariaDB 10.3

with row size issue  https://lab.civicrm.org/dev/core/-/issues/2784

diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php
index f134e0eaff2dfcee90a918c32a0d660467139a0e..06909bff331b93bd8e648d057a9526cc5e19bbc0 100644 (file)
--- a/CRM/Export/BAO/ExportProcessor.php
+++ b/CRM/Export/BAO/ExportProcessor.php
@@ -1469,7 +1469,7 @@ class CRM_Export_BAO_ExportProcessor {
             // @see https://lab.civicrm.org/dev/core/-/issues/2645
             switch ($fieldName) {
               case 'preferred_mail_format':
-                return "`$fieldName` varchar(16)";
+                return "`$fieldName` text(16)";
 
               default:
                 return "`$fieldName` varchar({$fieldSpec['maxlength']})";

diff --git a/tests/phpunit/CRM/Export/BAO/ExportTest.php b/tests/phpunit/CRM/Export/BAO/ExportTest.php
index 690bee27979dd088fcbd193a9ef3436f231c5fa9..4ba716c440f11abefe258deb2581eb192af3e4d2 100644 (file)
--- a/tests/phpunit/CRM/Export/BAO/ExportTest.php
+++ b/tests/phpunit/CRM/Export/BAO/ExportTest.php
@@ -2555,7 +2555,7 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'image_url' => '`image_url` longtext',
       'preferred_communication_method' => '`preferred_communication_method` varchar(255)',
       'preferred_language' => '`preferred_language` varchar(5)',
-      'preferred_mail_format' => '`preferred_mail_format` varchar(16)',
+      'preferred_mail_format' => '`preferred_mail_format` text(16)',
       'hash' => '`hash` varchar(32)',
       'contact_source' => '`contact_source` varchar(255)',
       'first_name' => '`first_name` varchar(64)',
@@ -2743,7 +2743,7 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'image_url' => '`image_url` longtext',
       'preferred_communication_method' => '`preferred_communication_method` varchar(255)',
       'preferred_language' => '`preferred_language` varchar(5)',
-      'preferred_mail_format' => '`preferred_mail_format` varchar(16)',
+      'preferred_mail_format' => '`preferred_mail_format` text(16)',
       'hash' => '`hash` varchar(32)',
       'contact_source' => '`contact_source` varchar(255)',
       'first_name' => '`first_name` varchar(64)',