proposed fix for CORE-2164
authorB. Endres <endres@systopia.de>
Sat, 3 Apr 2021 17:47:53 +0000 (19:47 +0200)
committerB. Endres <endres@systopia.de>
Sat, 3 Apr 2021 17:47:53 +0000 (19:47 +0200)
CRM/Export/BAO/ExportProcessor.php
tests/phpunit/CRM/Export/BAO/ExportTest.php

index c3b0dd24bf6c4e428039ba1e66ec544d9e6f9b50..fff50a8dad1e8cfd6d91a3e2542f23ee9b01192a 100644 (file)
@@ -1458,7 +1458,9 @@ class CRM_Export_BAO_ExportProcessor {
           if (in_array(CRM_Utils_Array::value('data_type', $fieldSpec), ['Country', 'StateProvince', 'ContactReference'])) {
             return "`$fieldName` varchar(255)";
           }
-          return "`$fieldName` varchar(16)";
+          // some of those will be exported as a (localisable) string
+          // @see https://lab.civicrm.org/dev/core/-/issues/2164
+          return "`$fieldName` varchar(64)";
 
         case CRM_Utils_Type::T_STRING:
           if (isset($fieldSpec['maxlength'])) {
index 9bc95db1d9cf3f73b08ce31047e486753c764ff4..1c8dd99a8b2e1dad1e6919cca6227e4bb085439a 100644 (file)
@@ -1014,7 +1014,7 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
     }
 
     $this->assertEquals([
-      'contact_id' => '`contact_id` varchar(16)',
+      'contact_id' => '`contact_id` varchar(64)',
       'billing_city' => '`billing_city` varchar(64)',
       'billing_street_address' => '`billing_street_address` varchar(96)',
       'billing_postal_code' => '`billing_postal_code` varchar(64)',
@@ -1968,14 +1968,14 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   public function getAllSpecifiableParticipantReturnColumns(): array {
     return [
-      'participant_campaign_id' => '`participant_campaign_id` varchar(16)',
-      'participant_contact_id' => '`participant_contact_id` varchar(16)',
+      'participant_campaign_id' => '`participant_campaign_id` varchar(64)',
+      'participant_contact_id' => '`participant_contact_id` varchar(64)',
       'componentpaymentfield_contribution_status' => '`componentpaymentfield_contribution_status` varchar(255)',
       'currency' => '`currency` varchar(3)',
       'componentpaymentfield_received_date' => '`componentpaymentfield_received_date` varchar(32)',
-      'default_role_id' => '`default_role_id` varchar(16)',
-      'participant_discount_name' => '`participant_discount_name` varchar(16)',
-      'event_id' => '`event_id` varchar(16)',
+      'default_role_id' => '`default_role_id` varchar(64)',
+      'participant_discount_name' => '`participant_discount_name` varchar(64)',
+      'event_id' => '`event_id` varchar(64)',
       'event_end_date' => '`event_end_date` varchar(32)',
       'event_start_date' => '`event_start_date` varchar(32)',
       'template_title' => '`template_title` varchar(255)',
@@ -1984,20 +1984,20 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'participant_fee_currency' => '`participant_fee_currency` varchar(3)',
       'fee_label' => '`fee_label` varchar(255)',
       'participant_fee_level' => '`participant_fee_level` longtext',
-      'participant_is_pay_later' => '`participant_is_pay_later` varchar(16)',
-      'participant_id' => '`participant_id` varchar(16)',
+      'participant_is_pay_later' => '`participant_is_pay_later` varchar(64)',
+      'participant_id' => '`participant_id` varchar(64)',
       'participant_note' => '`participant_note` longtext',
       'participant_role_id' => '`participant_role_id` varchar(128)',
       'participant_role' => '`participant_role` varchar(255)',
       'participant_source' => '`participant_source` varchar(128)',
-      'participant_status_id' => '`participant_status_id` varchar(16)',
+      'participant_status_id' => '`participant_status_id` varchar(64)',
       'participant_status' => '`participant_status` varchar(255)',
       'participant_register_date' => '`participant_register_date` varchar(32)',
-      'participant_registered_by_id' => '`participant_registered_by_id` varchar(16)',
-      'participant_is_test' => '`participant_is_test` varchar(16)',
+      'participant_registered_by_id' => '`participant_registered_by_id` varchar(64)',
+      'participant_is_test' => '`participant_is_test` varchar(64)',
       'componentpaymentfield_total_amount' => '`componentpaymentfield_total_amount` varchar(32)',
       'componentpaymentfield_transaction_id' => '`componentpaymentfield_transaction_id` varchar(255)',
-      'transferred_to_contact_id' => '`transferred_to_contact_id` varchar(16)',
+      'transferred_to_contact_id' => '`transferred_to_contact_id` varchar(64)',
     ];
   }
 
@@ -2537,15 +2537,15 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   protected function getBasicSqlColumnDefinition($isContactExport): array {
     $columns = [
-      'civicrm_primary_id' => '`civicrm_primary_id` varchar(16)',
+      'civicrm_primary_id' => '`civicrm_primary_id` varchar(64)',
       'contact_type' => '`contact_type` varchar(64)',
       'contact_sub_type' => '`contact_sub_type` varchar(255)',
-      'do_not_email' => '`do_not_email` varchar(16)',
-      'do_not_phone' => '`do_not_phone` varchar(16)',
-      'do_not_mail' => '`do_not_mail` varchar(16)',
-      'do_not_sms' => '`do_not_sms` varchar(16)',
-      'do_not_trade' => '`do_not_trade` varchar(16)',
-      'is_opt_out' => '`is_opt_out` varchar(16)',
+      'do_not_email' => '`do_not_email` varchar(64)',
+      'do_not_phone' => '`do_not_phone` varchar(64)',
+      'do_not_mail' => '`do_not_mail` varchar(64)',
+      'do_not_sms' => '`do_not_sms` varchar(64)',
+      'do_not_trade' => '`do_not_trade` varchar(64)',
+      'is_opt_out' => '`is_opt_out` varchar(64)',
       'legal_identifier' => '`legal_identifier` varchar(32)',
       'external_identifier' => '`external_identifier` varchar(64)',
       'sort_name' => '`sort_name` varchar(128)',
@@ -2565,20 +2565,20 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'suffix_id' => '`suffix_id` varchar(255)',
       'formal_title' => '`formal_title` varchar(64)',
       'communication_style_id' => '`communication_style_id` varchar(255)',
-      'email_greeting_id' => '`email_greeting_id` varchar(16)',
-      'postal_greeting_id' => '`postal_greeting_id` varchar(16)',
-      'addressee_id' => '`addressee_id` varchar(16)',
+      'email_greeting_id' => '`email_greeting_id` varchar(64)',
+      'postal_greeting_id' => '`postal_greeting_id` varchar(64)',
+      'addressee_id' => '`addressee_id` varchar(64)',
       'job_title' => '`job_title` varchar(255)',
       'gender_id' => '`gender_id` varchar(255)',
       'birth_date' => '`birth_date` varchar(32)',
-      'is_deceased' => '`is_deceased` varchar(16)',
+      'is_deceased' => '`is_deceased` varchar(64)',
       'deceased_date' => '`deceased_date` varchar(32)',
       'household_name' => '`household_name` varchar(128)',
       'organization_name' => '`organization_name` varchar(128)',
       'sic_code' => '`sic_code` varchar(8)',
       'user_unique_id' => '`user_unique_id` varchar(255)',
-      'current_employer_id' => '`current_employer_id` varchar(16)',
-      'contact_is_deleted' => '`contact_is_deleted` varchar(16)',
+      'current_employer_id' => '`current_employer_id` varchar(64)',
+      'contact_is_deleted' => '`contact_is_deleted` varchar(64)',
       'created_date' => '`created_date` varchar(32)',
       'modified_date' => '`modified_date` varchar(32)',
       'addressee' => '`addressee` varchar(255)',
@@ -2586,9 +2586,9 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'postal_greeting' => '`postal_greeting` varchar(255)',
       'current_employer' => '`current_employer` varchar(255)',
       'location_type' => '`location_type` varchar(255)',
-      'address_id' => '`address_id` varchar(16)',
+      'address_id' => '`address_id` varchar(64)',
       'street_address' => '`street_address` varchar(96)',
-      'street_number' => '`street_number` varchar(16)',
+      'street_number' => '`street_number` varchar(64)',
       'street_number_suffix' => '`street_number_suffix` varchar(8)',
       'street_name' => '`street_name` varchar(64)',
       'street_unit' => '`street_unit` varchar(16)',
@@ -2600,7 +2600,7 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'postal_code' => '`postal_code` varchar(64)',
       'geo_code_1' => '`geo_code_1` varchar(32)',
       'geo_code_2' => '`geo_code_2` varchar(32)',
-      'manual_geo_code' => '`manual_geo_code` varchar(16)',
+      'manual_geo_code' => '`manual_geo_code` varchar(64)',
       'address_name' => '`address_name` varchar(255)',
       'master_id' => '`master_id` varchar(128)',
       'county' => '`county` varchar(64)',
@@ -2608,10 +2608,10 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'country' => '`country` varchar(64)',
       'phone' => '`phone` varchar(32)',
       'phone_ext' => '`phone_ext` varchar(16)',
-      'phone_type_id' => '`phone_type_id` varchar(16)',
+      'phone_type_id' => '`phone_type_id` varchar(64)',
       'email' => '`email` varchar(254)',
-      'on_hold' => '`on_hold` varchar(16)',
-      'is_bulkmail' => '`is_bulkmail` varchar(16)',
+      'on_hold' => '`on_hold` varchar(64)',
+      'is_bulkmail' => '`is_bulkmail` varchar(64)',
       'signature_text' => '`signature_text` longtext',
       'signature_html' => '`signature_html` longtext',
       'im_provider' => '`im_provider` varchar(255)',
@@ -2644,17 +2644,17 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'case_subject' => '`case_subject` varchar(128)',
       'case_source_contact_id' => '`case_source_contact_id` varchar(255)',
       'case_activity_status' => '`case_activity_status` varchar(255)',
-      'case_activity_duration' => '`case_activity_duration` varchar(16)',
-      'case_activity_medium_id' => '`case_activity_medium_id` varchar(16)',
+      'case_activity_duration' => '`case_activity_duration` varchar(64)',
+      'case_activity_medium_id' => '`case_activity_medium_id` varchar(64)',
       'case_activity_details' => '`case_activity_details` longtext',
-      'case_activity_is_auto' => '`case_activity_is_auto` varchar(16)',
-      'contact_id' => '`contact_id` varchar(16)',
-      'case_id' => '`case_id` varchar(16)',
+      'case_activity_is_auto' => '`case_activity_is_auto` varchar(64)',
+      'contact_id' => '`contact_id` varchar(64)',
+      'case_id' => '`case_id` varchar(64)',
       'case_activity_subject' => '`case_activity_subject` varchar(255)',
       'case_status' => '`case_status` text',
       'case_type' => '`case_type` text',
       'case_role' => '`case_role` text',
-      'case_deleted' => '`case_deleted` varchar(16)',
+      'case_deleted' => '`case_deleted` varchar(64)',
       'case_activity_date_time' => '`case_activity_date_time` varchar(32)',
       'case_activity_type' => '`case_activity_type` varchar(255)',
     ];
@@ -2667,22 +2667,22 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   protected function getActivitySqlColumns(): array {
     return [
-      'activity_id' => '`activity_id` varchar(16)',
+      'activity_id' => '`activity_id` varchar(64)',
       'activity_type' => '`activity_type` varchar(255)',
-      'activity_type_id' => '`activity_type_id` varchar(16)',
+      'activity_type_id' => '`activity_type_id` varchar(64)',
       'activity_subject' => '`activity_subject` varchar(255)',
       'activity_date_time' => '`activity_date_time` varchar(32)',
-      'activity_duration' => '`activity_duration` varchar(16)',
+      'activity_duration' => '`activity_duration` varchar(64)',
       'activity_location' => '`activity_location` varchar(255)',
       'activity_details' => '`activity_details` longtext',
       'activity_status' => '`activity_status` varchar(255)',
       'activity_priority' => '`activity_priority` varchar(255)',
       'source_contact' => '`source_contact` varchar(255)',
       'source_record_id' => '`source_record_id` varchar(255)',
-      'activity_is_test' => '`activity_is_test` varchar(16)',
-      'activity_campaign_id' => '`activity_campaign_id` varchar(16)',
+      'activity_is_test' => '`activity_is_test` varchar(64)',
+      'activity_campaign_id' => '`activity_campaign_id` varchar(64)',
       'result' => '`result` text',
-      'activity_engagement_level' => '`activity_engagement_level` varchar(16)',
+      'activity_engagement_level' => '`activity_engagement_level` varchar(64)',
       'parent_id' => '`parent_id` varchar(255)',
     ];
   }
@@ -2694,27 +2694,27 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   protected function getParticipantSqlColumns(): array {
     return [
-      'event_id' => '`event_id` varchar(16)',
+      'event_id' => '`event_id` varchar(64)',
       'event_title' => '`event_title` varchar(255)',
       'event_start_date' => '`event_start_date` varchar(32)',
       'event_end_date' => '`event_end_date` varchar(32)',
       'event_type' => '`event_type` varchar(255)',
-      'participant_id' => '`participant_id` varchar(16)',
+      'participant_id' => '`participant_id` varchar(64)',
       'participant_status' => '`participant_status` varchar(255)',
-      'participant_status_id' => '`participant_status_id` varchar(16)',
+      'participant_status_id' => '`participant_status_id` varchar(64)',
       'participant_role' => '`participant_role` varchar(255)',
       'participant_role_id' => '`participant_role_id` varchar(128)',
       'participant_note' => '`participant_note` longtext',
       'participant_register_date' => '`participant_register_date` varchar(32)',
       'participant_source' => '`participant_source` varchar(128)',
       'participant_fee_level' => '`participant_fee_level` longtext',
-      'participant_is_test' => '`participant_is_test` varchar(16)',
-      'participant_is_pay_later' => '`participant_is_pay_later` varchar(16)',
+      'participant_is_test' => '`participant_is_test` varchar(64)',
+      'participant_is_pay_later' => '`participant_is_pay_later` varchar(64)',
       'participant_fee_amount' => '`participant_fee_amount` varchar(32)',
-      'participant_discount_name' => '`participant_discount_name` varchar(16)',
+      'participant_discount_name' => '`participant_discount_name` varchar(64)',
       'participant_fee_currency' => '`participant_fee_currency` varchar(3)',
-      'participant_registered_by_id' => '`participant_registered_by_id` varchar(16)',
-      'participant_campaign_id' => '`participant_campaign_id` varchar(16)',
+      'participant_registered_by_id' => '`participant_registered_by_id` varchar(64)',
+      'participant_campaign_id' => '`participant_campaign_id` varchar(64)',
     ];
   }
 
@@ -2725,15 +2725,15 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   public function getContributionSqlColumns(): array {
     return [
-      'civicrm_primary_id' => '`civicrm_primary_id` varchar(16)',
+      'civicrm_primary_id' => '`civicrm_primary_id` varchar(64)',
       'contact_type' => '`contact_type` varchar(64)',
       'contact_sub_type' => '`contact_sub_type` varchar(255)',
-      'do_not_email' => '`do_not_email` varchar(16)',
-      'do_not_phone' => '`do_not_phone` varchar(16)',
-      'do_not_mail' => '`do_not_mail` varchar(16)',
-      'do_not_sms' => '`do_not_sms` varchar(16)',
-      'do_not_trade' => '`do_not_trade` varchar(16)',
-      'is_opt_out' => '`is_opt_out` varchar(16)',
+      'do_not_email' => '`do_not_email` varchar(64)',
+      'do_not_phone' => '`do_not_phone` varchar(64)',
+      'do_not_mail' => '`do_not_mail` varchar(64)',
+      'do_not_sms' => '`do_not_sms` varchar(64)',
+      'do_not_trade' => '`do_not_trade` varchar(64)',
+      'is_opt_out' => '`is_opt_out` varchar(64)',
       'legal_identifier' => '`legal_identifier` varchar(32)',
       'external_identifier' => '`external_identifier` varchar(64)',
       'sort_name' => '`sort_name` varchar(128)',
@@ -2753,20 +2753,20 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'suffix_id' => '`suffix_id` varchar(255)',
       'formal_title' => '`formal_title` varchar(64)',
       'communication_style_id' => '`communication_style_id` varchar(255)',
-      'email_greeting_id' => '`email_greeting_id` varchar(16)',
-      'postal_greeting_id' => '`postal_greeting_id` varchar(16)',
-      'addressee_id' => '`addressee_id` varchar(16)',
+      'email_greeting_id' => '`email_greeting_id` varchar(64)',
+      'postal_greeting_id' => '`postal_greeting_id` varchar(64)',
+      'addressee_id' => '`addressee_id` varchar(64)',
       'job_title' => '`job_title` varchar(255)',
       'gender_id' => '`gender_id` varchar(255)',
       'birth_date' => '`birth_date` varchar(32)',
-      'is_deceased' => '`is_deceased` varchar(16)',
+      'is_deceased' => '`is_deceased` varchar(64)',
       'deceased_date' => '`deceased_date` varchar(32)',
       'household_name' => '`household_name` varchar(128)',
       'organization_name' => '`organization_name` varchar(128)',
       'sic_code' => '`sic_code` varchar(8)',
       'user_unique_id' => '`user_unique_id` varchar(255)',
-      'current_employer_id' => '`current_employer_id` varchar(16)',
-      'contact_is_deleted' => '`contact_is_deleted` varchar(16)',
+      'current_employer_id' => '`current_employer_id` varchar(64)',
+      'contact_is_deleted' => '`contact_is_deleted` varchar(64)',
       'created_date' => '`created_date` varchar(32)',
       'modified_date' => '`modified_date` varchar(32)',
       'addressee' => '`addressee` varchar(255)',
@@ -2775,7 +2775,7 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'current_employer' => '`current_employer` varchar(255)',
       'location_type' => '`location_type` varchar(255)',
       'street_address' => '`street_address` varchar(96)',
-      'street_number' => '`street_number` varchar(16)',
+      'street_number' => '`street_number` varchar(64)',
       'street_number_suffix' => '`street_number_suffix` varchar(8)',
       'street_name' => '`street_name` varchar(64)',
       'street_unit' => '`street_unit` varchar(16)',
@@ -2795,8 +2795,8 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'phone' => '`phone` varchar(32)',
       'phone_ext' => '`phone_ext` varchar(16)',
       'email' => '`email` varchar(254)',
-      'on_hold' => '`on_hold` varchar(16)',
-      'is_bulkmail' => '`is_bulkmail` varchar(16)',
+      'on_hold' => '`on_hold` varchar(64)',
+      'is_bulkmail' => '`is_bulkmail` varchar(64)',
       'signature_text' => '`signature_text` longtext',
       'signature_html' => '`signature_html` longtext',
       'im_provider' => '`im_provider` varchar(255)',
@@ -2804,7 +2804,7 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'openid' => '`openid` varchar(255)',
       'world_region' => '`world_region` varchar(128)',
       'url' => '`url` varchar(128)',
-      'phone_type_id' => '`phone_type_id` varchar(16)',
+      'phone_type_id' => '`phone_type_id` varchar(64)',
       'financial_type' => '`financial_type` varchar(255)',
       'contribution_source' => '`contribution_source` varchar(255)',
       'receive_date' => '`receive_date` varchar(32)',
@@ -2813,7 +2813,7 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'total_amount' => '`total_amount` varchar(32)',
       'accounting_code' => '`accounting_code` varchar(64)',
       'payment_instrument' => '`payment_instrument` varchar(255)',
-      'payment_instrument_id' => '`payment_instrument_id` varchar(16)',
+      'payment_instrument_id' => '`payment_instrument_id` varchar(64)',
       'contribution_check_number' => '`contribution_check_number` varchar(255)',
       'non_deductible_amount' => '`non_deductible_amount` varchar(32)',
       'fee_amount' => '`fee_amount` varchar(32)',
@@ -2824,20 +2824,20 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'currency' => '`currency` varchar(3)',
       'cancel_reason' => '`cancel_reason` longtext',
       'receipt_date' => '`receipt_date` varchar(32)',
-      'is_test' => '`is_test` varchar(16)',
-      'is_pay_later' => '`is_pay_later` varchar(16)',
+      'is_test' => '`is_test` varchar(64)',
+      'is_pay_later' => '`is_pay_later` varchar(64)',
       'contribution_status' => '`contribution_status` varchar(255)',
-      'contribution_recur_id' => '`contribution_recur_id` varchar(16)',
+      'contribution_recur_id' => '`contribution_recur_id` varchar(64)',
       'amount_level' => '`amount_level` longtext',
       'contribution_note' => '`contribution_note` longtext',
       'contribution_batch' => '`contribution_batch` text',
       'contribution_campaign_title' => '`contribution_campaign_title` varchar(255)',
-      'contribution_campaign_id' => '`contribution_campaign_id` varchar(16)',
+      'contribution_campaign_id' => '`contribution_campaign_id` varchar(64)',
       'contribution_soft_credit_name' => '`contribution_soft_credit_name` varchar(255)',
       'contribution_soft_credit_amount' => '`contribution_soft_credit_amount` varchar(32)',
       'contribution_soft_credit_type' => '`contribution_soft_credit_type` varchar(255)',
-      'contribution_soft_credit_contact_id' => '`contribution_soft_credit_contact_id` varchar(16)',
-      'contribution_soft_credit_contribution_id' => '`contribution_soft_credit_contribution_id` varchar(16)',
+      'contribution_soft_credit_contact_id' => '`contribution_soft_credit_contact_id` varchar(64)',
+      'contribution_soft_credit_contribution_id' => '`contribution_soft_credit_contribution_id` varchar(64)',
     ];
   }
 
@@ -2848,7 +2848,7 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   public function getPledgeSqlColumns(): array {
     return [
-      'pledge_id' => '`pledge_id` varchar(16)',
+      'pledge_id' => '`pledge_id` varchar(64)',
       'pledge_amount' => '`pledge_amount` varchar(32)',
       'pledge_total_paid' => '`pledge_total_paid` text',
       'pledge_create_date' => '`pledge_create_date` varchar(32)',
@@ -2856,21 +2856,21 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
       'pledge_next_pay_date' => '`pledge_next_pay_date` text',
       'pledge_next_pay_amount' => '`pledge_next_pay_amount` text',
       'pledge_status' => '`pledge_status` varchar(255)',
-      'pledge_is_test' => '`pledge_is_test` varchar(16)',
-      'pledge_contribution_page_id' => '`pledge_contribution_page_id` varchar(16)',
+      'pledge_is_test' => '`pledge_is_test` varchar(64)',
+      'pledge_contribution_page_id' => '`pledge_contribution_page_id` varchar(64)',
       'pledge_financial_type' => '`pledge_financial_type` text',
-      'pledge_frequency_interval' => '`pledge_frequency_interval` varchar(16)',
+      'pledge_frequency_interval' => '`pledge_frequency_interval` varchar(64)',
       'pledge_frequency_unit' => '`pledge_frequency_unit` varchar(255)',
       'pledge_currency' => '`pledge_currency` text',
-      'pledge_campaign_id' => '`pledge_campaign_id` varchar(16)',
+      'pledge_campaign_id' => '`pledge_campaign_id` varchar(64)',
       'pledge_balance_amount' => '`pledge_balance_amount` text',
-      'pledge_payment_id' => '`pledge_payment_id` varchar(16)',
+      'pledge_payment_id' => '`pledge_payment_id` varchar(64)',
       'pledge_payment_scheduled_amount' => '`pledge_payment_scheduled_amount` varchar(32)',
       'pledge_payment_scheduled_date' => '`pledge_payment_scheduled_date` varchar(32)',
       'pledge_payment_paid_amount' => '`pledge_payment_paid_amount` text',
       'pledge_payment_paid_date' => '`pledge_payment_paid_date` text',
       'pledge_payment_reminder_date' => '`pledge_payment_reminder_date` varchar(32)',
-      'pledge_payment_reminder_count' => '`pledge_payment_reminder_count` varchar(16)',
+      'pledge_payment_reminder_count' => '`pledge_payment_reminder_count` varchar(64)',
       'pledge_payment_status' => '`pledge_payment_status` varchar(255)',
     ];
   }
@@ -2883,19 +2883,19 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
   public function getMembershipSqlColumns(): array {
     return [
       'membership_type' => '`membership_type` varchar(128)',
-      'member_is_test' => '`member_is_test` varchar(16)',
-      'member_is_pay_later' => '`member_is_pay_later` varchar(16)',
+      'member_is_test' => '`member_is_test` varchar(64)',
+      'member_is_pay_later' => '`member_is_pay_later` varchar(64)',
       'membership_join_date' => '`membership_join_date` varchar(32)',
       'membership_start_date' => '`membership_start_date` varchar(32)',
       'membership_end_date' => '`membership_end_date` varchar(32)',
       'membership_source' => '`membership_source` varchar(128)',
       'membership_status' => '`membership_status` varchar(255)',
-      'membership_id' => '`membership_id` varchar(16)',
-      'owner_membership_id' => '`owner_membership_id` varchar(16)',
-      'max_related' => '`max_related` varchar(16)',
-      'membership_recur_id' => '`membership_recur_id` varchar(16)',
-      'member_campaign_id' => '`member_campaign_id` varchar(16)',
-      'member_is_override' => '`member_is_override` varchar(16)',
+      'membership_id' => '`membership_id` varchar(64)',
+      'owner_membership_id' => '`owner_membership_id` varchar(64)',
+      'max_related' => '`max_related` varchar(64)',
+      'membership_recur_id' => '`membership_recur_id` varchar(64)',
+      'member_campaign_id' => '`member_campaign_id` varchar(64)',
+      'member_is_override' => '`member_is_override` varchar(64)',
     ];
   }