From a82f4c9f5a2d035f04287353c31feae56d8ed717 Mon Sep 17 00:00:00 2001 From: Kevin Cristiano Date: Mon, 23 Aug 2021 22:12:04 -0400 Subject: [PATCH] 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 --- CRM/Export/BAO/ExportProcessor.php | 2 +- tests/phpunit/CRM/Export/BAO/ExportTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php index f134e0eaff..06909bff33 100644 --- 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 690bee2797..4ba716c440 100644 --- 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)', -- 2.25.1