dev/core#1143 Ensure that any field name when performaning an export is quoted so...

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 0c4e50c844b19a77288cb28514b5b97c432023cc..5ddf6cb6798982e5e41cc8d4a47462ecfe3e6ae7 100644 (file)
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -330,7 +330,7 @@ FROM   $tableName
       $sqlClause[] = '(' . implode(',', $valueString) . ')';
     }
     $sqlColumns = array_merge(['id' => 1], $processor->getSQLColumns());
-    $sqlColumnString = '(' . implode(',', array_keys($sqlColumns)) . ')';
+    $sqlColumnString = '(`' . implode('`, `', array_keys($sqlColumns)) . '`)';
 
     $sqlValueString = implode(",\n", $sqlClause);
 

diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php
index bffb062de0022ace04fcb0df5539ad47055bf682..8770d5dcc9fa32995f27ab8f5ce3b99575be3587 100644 (file)
--- a/CRM/Export/BAO/ExportProcessor.php
+++ b/CRM/Export/BAO/ExportProcessor.php
@@ -1431,7 +1431,7 @@ class CRM_Export_BAO_ExportProcessor {
     // in the DB it is an ID, but in the export, we retrive the display_name of the master record
     // also for current_employer, CRM-16939
     if ($columnName == 'master_id' || $columnName == 'current_employer') {
-      return "$fieldName varchar(128)";
+      return "`$fieldName` varchar(128)";
     }
 
     $queryFields = $this->getQueryFields();
@@ -1446,23 +1446,23 @@ class CRM_Export_BAO_ExportProcessor {
         case CRM_Utils_Type::T_INT:
         case CRM_Utils_Type::T_BOOLEAN:
           if (in_array(CRM_Utils_Array::value('data_type', $fieldSpec), ['Country', 'StateProvince', 'ContactReference'])) {
-            return "$fieldName varchar(255)";
+            return "`$fieldName` varchar(255)";
           }
-          return "$fieldName varchar(16)";
+          return "`$fieldName` varchar(16)";
 
         case CRM_Utils_Type::T_STRING:
           if (isset($queryFields[$columnName]['maxlength'])) {
-            return "$fieldName varchar({$queryFields[$columnName]['maxlength']})";
+            return "`$fieldName` varchar({$queryFields[$columnName]['maxlength']})";
           }
           else {
-            return "$fieldName varchar(255)";
+            return "`$fieldName` varchar(255)";
           }
 
         case CRM_Utils_Type::T_TEXT:
         case CRM_Utils_Type::T_LONGTEXT:
         case CRM_Utils_Type::T_BLOB:
         case CRM_Utils_Type::T_MEDIUMBLOB:
-          return "$fieldName longtext";
+          return "`$fieldName` longtext";
 
         case CRM_Utils_Type::T_FLOAT:
         case CRM_Utils_Type::T_ENUM:
@@ -1474,15 +1474,15 @@ class CRM_Export_BAO_ExportProcessor {
         case CRM_Utils_Type::T_URL:
         case CRM_Utils_Type::T_CCNUM:
         default:
-          return "$fieldName varchar(32)";
+          return "`$fieldName` varchar(32)";
       }
     }
     else {
       if (substr($fieldName, -3, 3) == '_id') {
-        return "$fieldName varchar(255)";
+        return "`$fieldName` varchar(255)";
       }
       elseif (substr($fieldName, -5, 5) == '_note') {
-        return "$fieldName text";
+        return "`$fieldName` text";
       }
       else {
         $changeFields = [
@@ -1492,7 +1492,7 @@ class CRM_Export_BAO_ExportProcessor {
         ];
 
         if (in_array($fieldName, $changeFields)) {
-          return "$fieldName text";
+          return "`$fieldName` text";
         }
         else {
           // set the sql columns for custom data
@@ -1502,20 +1502,20 @@ class CRM_Export_BAO_ExportProcessor {
               case 'String':
                 // May be option labels, which could be up to 512 characters
                 $length = max(512, CRM_Utils_Array::value('text_length', $queryFields[$columnName]));
-                return "$fieldName varchar($length)";
+                return "`$fieldName` varchar($length)";
 
               case 'Link':
-                return "$fieldName varchar(255)";
+                return "`$fieldName` varchar(255)";
 
               case 'Memo':
-                return "$fieldName text";
+                return "`$fieldName` text";
 
               default:
-                return "$fieldName varchar(255)";
+                return "`$fieldName` varchar(255)";
             }
           }
           else {
-            return "$fieldName text";
+            return "`$fieldName` text";
           }
         }
       }

diff --git a/tests/phpunit/CRM/Export/BAO/ExportTest.php b/tests/phpunit/CRM/Export/BAO/ExportTest.php
index 86df6ae15a9f3b098b1482f23aaeb6bcc4f2682f..a72f09478da18f085787abfaa104559a0098d8cd 100644 (file)
--- a/tests/phpunit/CRM/Export/BAO/ExportTest.php
+++ b/tests/phpunit/CRM/Export/BAO/ExportTest.php
@@ -986,40 +986,40 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
     }
 
     $this->assertEquals([
-      'contact_id' => 'contact_id varchar(16)',
-      'billing_city' => 'billing_city varchar(64)',
-      'billing_street_address' => 'billing_street_address varchar(96)',
-      'billing_postal_code' => 'billing_postal_code varchar(64)',
-      'home_city' => 'home_city varchar(64)',
-      'home_street_address' => 'home_street_address varchar(96)',
-      'home_postal_code' => 'home_postal_code varchar(64)',
-      'main_city' => 'main_city varchar(64)',
-      'main_street_address' => 'main_street_address varchar(96)',
-      'main_postal_code' => 'main_postal_code varchar(64)',
-      'other_city' => 'other_city varchar(64)',
-      'other_street_address' => 'other_street_address varchar(96)',
-      'other_postal_code' => 'other_postal_code varchar(64)',
-      'whare_kai_city' => 'whare_kai_city varchar(64)',
-      'whare_kai_street_address' => 'whare_kai_street_address varchar(96)',
-      'whare_kai_postal_code' => 'whare_kai_postal_code varchar(64)',
-      '2_a_b_billing_city' => '2_a_b_billing_city varchar(64)',
-      '2_a_b_home_city' => '2_a_b_home_city varchar(64)',
-      '2_a_b_main_city' => '2_a_b_main_city varchar(64)',
-      '2_a_b_other_city' => '2_a_b_other_city varchar(64)',
-      '2_a_b_whare_kai_city' => '2_a_b_whare_kai_city varchar(64)',
-      '2_a_b_city' => '2_a_b_city varchar(64)',
-      '8_a_b_billing_city' => '8_a_b_billing_city varchar(64)',
-      '8_a_b_home_city' => '8_a_b_home_city varchar(64)',
-      '8_a_b_main_city' => '8_a_b_main_city varchar(64)',
-      '8_a_b_other_city' => '8_a_b_other_city varchar(64)',
-      '8_a_b_whare_kai_city' => '8_a_b_whare_kai_city varchar(64)',
-      '8_a_b_city' => '8_a_b_city varchar(64)',
-      '5_a_b_billing_city' => '5_a_b_billing_city varchar(64)',
-      '5_a_b_home_city' => '5_a_b_home_city varchar(64)',
-      '5_a_b_main_city' => '5_a_b_main_city varchar(64)',
-      '5_a_b_other_city' => '5_a_b_other_city varchar(64)',
-      '5_a_b_whare_kai_city' => '5_a_b_whare_kai_city varchar(64)',
-      '5_a_b_city' => '5_a_b_city varchar(64)',
+      'contact_id' => '`contact_id` varchar(16)',
+      'billing_city' => '`billing_city` varchar(64)',
+      'billing_street_address' => '`billing_street_address` varchar(96)',
+      'billing_postal_code' => '`billing_postal_code` varchar(64)',
+      'home_city' => '`home_city` varchar(64)',
+      'home_street_address' => '`home_street_address` varchar(96)',
+      'home_postal_code' => '`home_postal_code` varchar(64)',
+      'main_city' => '`main_city` varchar(64)',
+      'main_street_address' => '`main_street_address` varchar(96)',
+      'main_postal_code' => '`main_postal_code` varchar(64)',
+      'other_city' => '`other_city` varchar(64)',
+      'other_street_address' => '`other_street_address` varchar(96)',
+      'other_postal_code' => '`other_postal_code` varchar(64)',
+      'whare_kai_city' => '`whare_kai_city` varchar(64)',
+      'whare_kai_street_address' => '`whare_kai_street_address` varchar(96)',
+      'whare_kai_postal_code' => '`whare_kai_postal_code` varchar(64)',
+      '2_a_b_billing_city' => '`2_a_b_billing_city` varchar(64)',
+      '2_a_b_home_city' => '`2_a_b_home_city` varchar(64)',
+      '2_a_b_main_city' => '`2_a_b_main_city` varchar(64)',
+      '2_a_b_other_city' => '`2_a_b_other_city` varchar(64)',
+      '2_a_b_whare_kai_city' => '`2_a_b_whare_kai_city` varchar(64)',
+      '2_a_b_city' => '`2_a_b_city` varchar(64)',
+      '8_a_b_billing_city' => '`8_a_b_billing_city` varchar(64)',
+      '8_a_b_home_city' => '`8_a_b_home_city` varchar(64)',
+      '8_a_b_main_city' => '`8_a_b_main_city` varchar(64)',
+      '8_a_b_other_city' => '`8_a_b_other_city` varchar(64)',
+      '8_a_b_whare_kai_city' => '`8_a_b_whare_kai_city` varchar(64)',
+      '8_a_b_city' => '`8_a_b_city` varchar(64)',
+      '5_a_b_billing_city' => '`5_a_b_billing_city` varchar(64)',
+      '5_a_b_home_city' => '`5_a_b_home_city` varchar(64)',
+      '5_a_b_main_city' => '`5_a_b_main_city` varchar(64)',
+      '5_a_b_other_city' => '`5_a_b_other_city` varchar(64)',
+      '5_a_b_whare_kai_city' => '`5_a_b_whare_kai_city` varchar(64)',
+      '5_a_b_city' => '`5_a_b_city` varchar(64)',
     ], $this->processor->getSQLColumns());
   }
 
@@ -1887,36 +1887,36 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   public function getAllSpecifiableParticipantReturnColumns() {
     return [
-      'participant_campaign_id' => 'participant_campaign_id varchar(16)',
-      'participant_contact_id' => 'participant_contact_id varchar(16)',
-      '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)',
-      'event_end_date' => 'event_end_date varchar(32)',
-      'event_start_date' => 'event_start_date varchar(32)',
-      'template_title' => 'template_title varchar(255)',
-      'event_title' => 'event_title varchar(255)',
-      'participant_fee_amount' => 'participant_fee_amount varchar(32)',
-      '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_note' => 'participant_note text',
-      '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' => '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)',
-      '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)',
+      'participant_campaign_id' => '`participant_campaign_id` varchar(16)',
+      'participant_contact_id' => '`participant_contact_id` varchar(16)',
+      '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)',
+      'event_end_date' => '`event_end_date` varchar(32)',
+      'event_start_date' => '`event_start_date` varchar(32)',
+      'template_title' => '`template_title` varchar(255)',
+      'event_title' => '`event_title` varchar(255)',
+      'participant_fee_amount' => '`participant_fee_amount` varchar(32)',
+      '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_note' => '`participant_note` text',
+      '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' => '`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)',
+      '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)',
     ];
   }
 
@@ -2452,90 +2452,90 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   protected function getBasicSqlColumnDefinition($isContactExport) {
     $columns = [
-      'civicrm_primary_id' => 'civicrm_primary_id varchar(16)',
-      '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)',
-      'legal_identifier' => 'legal_identifier varchar(32)',
-      'external_identifier' => 'external_identifier varchar(64)',
-      'sort_name' => 'sort_name varchar(128)',
-      'display_name' => 'display_name varchar(128)',
-      'nick_name' => 'nick_name varchar(128)',
-      'legal_name' => 'legal_name varchar(128)',
-      '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(8)',
-      'hash' => 'hash varchar(32)',
-      'contact_source' => 'contact_source varchar(255)',
-      'first_name' => 'first_name varchar(64)',
-      'middle_name' => 'middle_name varchar(64)',
-      'last_name' => 'last_name varchar(64)',
-      'prefix_id' => 'prefix_id varchar(255)',
-      '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)',
-      'job_title' => 'job_title varchar(255)',
-      'gender_id' => 'gender_id varchar(255)',
-      'birth_date' => 'birth_date varchar(32)',
-      'is_deceased' => 'is_deceased varchar(16)',
-      '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)',
-      'created_date' => 'created_date varchar(32)',
-      'modified_date' => 'modified_date varchar(32)',
-      'addressee' => 'addressee varchar(255)',
-      'email_greeting' => 'email_greeting varchar(255)',
-      'postal_greeting' => 'postal_greeting varchar(255)',
-      'current_employer' => 'current_employer varchar(128)',
-      'location_type' => 'location_type text',
-      'street_address' => 'street_address varchar(96)',
-      'street_number' => 'street_number varchar(16)',
-      'street_number_suffix' => 'street_number_suffix varchar(8)',
-      'street_name' => 'street_name varchar(64)',
-      'street_unit' => 'street_unit varchar(16)',
-      'supplemental_address_1' => 'supplemental_address_1 varchar(96)',
-      'supplemental_address_2' => 'supplemental_address_2 varchar(96)',
-      'supplemental_address_3' => 'supplemental_address_3 varchar(96)',
-      'city' => 'city varchar(64)',
-      'postal_code_suffix' => 'postal_code_suffix varchar(12)',
-      '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)',
-      'address_name' => 'address_name varchar(255)',
-      'master_id' => 'master_id varchar(128)',
-      'county' => 'county varchar(64)',
-      'state_province' => 'state_province varchar(64)',
-      'country' => 'country varchar(64)',
-      'phone' => 'phone varchar(32)',
-      'phone_ext' => 'phone_ext varchar(16)',
-      'phone_type_id' => 'phone_type_id varchar(16)',
-      'email' => 'email varchar(254)',
-      'on_hold' => 'on_hold varchar(16)',
-      'is_bulkmail' => 'is_bulkmail varchar(16)',
-      'signature_text' => 'signature_text longtext',
-      'signature_html' => 'signature_html longtext',
-      'im_provider' => 'im_provider text',
-      'im_screen_name' => 'im_screen_name varchar(64)',
-      'openid' => 'openid varchar(255)',
-      'world_region' => 'world_region varchar(128)',
-      'url' => 'url varchar(128)',
-      'groups' => 'groups text',
-      'tags' => 'tags text',
-      'notes' => 'notes text',
+      'civicrm_primary_id' => '`civicrm_primary_id` varchar(16)',
+      '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)',
+      'legal_identifier' => '`legal_identifier` varchar(32)',
+      'external_identifier' => '`external_identifier` varchar(64)',
+      'sort_name' => '`sort_name` varchar(128)',
+      'display_name' => '`display_name` varchar(128)',
+      'nick_name' => '`nick_name` varchar(128)',
+      'legal_name' => '`legal_name` varchar(128)',
+      '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(8)',
+      'hash' => '`hash` varchar(32)',
+      'contact_source' => '`contact_source` varchar(255)',
+      'first_name' => '`first_name` varchar(64)',
+      'middle_name' => '`middle_name` varchar(64)',
+      'last_name' => '`last_name` varchar(64)',
+      'prefix_id' => '`prefix_id` varchar(255)',
+      '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)',
+      'job_title' => '`job_title` varchar(255)',
+      'gender_id' => '`gender_id` varchar(255)',
+      'birth_date' => '`birth_date` varchar(32)',
+      'is_deceased' => '`is_deceased` varchar(16)',
+      '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)',
+      'created_date' => '`created_date` varchar(32)',
+      'modified_date' => '`modified_date` varchar(32)',
+      'addressee' => '`addressee` varchar(255)',
+      'email_greeting' => '`email_greeting` varchar(255)',
+      'postal_greeting' => '`postal_greeting` varchar(255)',
+      'current_employer' => '`current_employer` varchar(128)',
+      'location_type' => '`location_type` text',
+      'street_address' => '`street_address` varchar(96)',
+      'street_number' => '`street_number` varchar(16)',
+      'street_number_suffix' => '`street_number_suffix` varchar(8)',
+      'street_name' => '`street_name` varchar(64)',
+      'street_unit' => '`street_unit` varchar(16)',
+      'supplemental_address_1' => '`supplemental_address_1` varchar(96)',
+      'supplemental_address_2' => '`supplemental_address_2` varchar(96)',
+      'supplemental_address_3' => '`supplemental_address_3` varchar(96)',
+      'city' => '`city` varchar(64)',
+      'postal_code_suffix' => '`postal_code_suffix` varchar(12)',
+      '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)',
+      'address_name' => '`address_name` varchar(255)',
+      'master_id' => '`master_id` varchar(128)',
+      'county' => '`county` varchar(64)',
+      'state_province' => '`state_province` varchar(64)',
+      'country' => '`country` varchar(64)',
+      'phone' => '`phone` varchar(32)',
+      'phone_ext' => '`phone_ext` varchar(16)',
+      'phone_type_id' => '`phone_type_id` varchar(16)',
+      'email' => '`email` varchar(254)',
+      'on_hold' => '`on_hold` varchar(16)',
+      'is_bulkmail' => '`is_bulkmail` varchar(16)',
+      'signature_text' => '`signature_text` longtext',
+      'signature_html' => '`signature_html` longtext',
+      'im_provider' => '`im_provider` text',
+      'im_screen_name' => '`im_screen_name` varchar(64)',
+      'openid' => '`openid` varchar(255)',
+      'world_region' => '`world_region` varchar(128)',
+      'url' => '`url` varchar(128)',
+      'groups' => '`groups` text',
+      'tags' => '`tags` text',
+      'notes' => '`notes` text',
     ];
     if (!$isContactExport) {
       unset($columns['groups']);
@@ -2552,25 +2552,25 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   protected function getCaseSqlColumns() {
     return [
-      'case_start_date' => 'case_start_date varchar(32)',
-      'case_end_date' => 'case_end_date varchar(32)',
-      'case_subject' => 'case_subject varchar(128)',
-      'case_source_contact_id' => 'case_source_contact_id varchar(255)',
-      'case_activity_status' => 'case_activity_status text',
-      'case_activity_duration' => 'case_activity_duration text',
-      'case_activity_medium_id' => 'case_activity_medium_id varchar(255)',
-      'case_activity_details' => 'case_activity_details text',
-      'case_activity_is_auto' => 'case_activity_is_auto text',
-      'contact_id' => 'contact_id varchar(16)',
-      'case_id' => 'case_id varchar(16)',
-      'case_activity_subject' => 'case_activity_subject text',
-      'case_status' => 'case_status text',
-      'case_type' => 'case_type text',
-      'case_role' => 'case_role text',
-      'case_deleted' => 'case_deleted varchar(16)',
-      'case_recent_activity_date' => 'case_recent_activity_date text',
-      'case_recent_activity_type' => 'case_recent_activity_type text',
-      'case_scheduled_activity_date' => 'case_scheduled_activity_date text',
+      'case_start_date' => '`case_start_date` varchar(32)',
+      'case_end_date' => '`case_end_date` varchar(32)',
+      'case_subject' => '`case_subject` varchar(128)',
+      'case_source_contact_id' => '`case_source_contact_id` varchar(255)',
+      'case_activity_status' => '`case_activity_status` text',
+      'case_activity_duration' => '`case_activity_duration` text',
+      'case_activity_medium_id' => '`case_activity_medium_id` varchar(255)',
+      'case_activity_details' => '`case_activity_details` text',
+      'case_activity_is_auto' => '`case_activity_is_auto` text',
+      'contact_id' => '`contact_id` varchar(16)',
+      'case_id' => '`case_id` varchar(16)',
+      'case_activity_subject' => '`case_activity_subject` text',
+      'case_status' => '`case_status` text',
+      'case_type' => '`case_type` text',
+      'case_role' => '`case_role` text',
+      'case_deleted' => '`case_deleted` varchar(16)',
+      'case_recent_activity_date' => '`case_recent_activity_date` text',
+      'case_recent_activity_type' => '`case_recent_activity_type` text',
+      'case_scheduled_activity_date' => '`case_scheduled_activity_date` text',
     ];
   }
 
@@ -2581,23 +2581,23 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   protected function getActivitySqlColumns() {
     return [
-      'activity_id' => 'activity_id varchar(16)',
-      'activity_type' => 'activity_type varchar(255)',
-      'activity_type_id' => 'activity_type_id varchar(16)',
-      'activity_subject' => 'activity_subject varchar(255)',
-      'activity_date_time' => 'activity_date_time varchar(32)',
-      'activity_duration' => 'activity_duration varchar(16)',
-      '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)',
-      'result' => 'result text',
-      'activity_engagement_level' => 'activity_engagement_level varchar(16)',
-      'parent_id' => 'parent_id varchar(255)',
+      'activity_id' => '`activity_id` varchar(16)',
+      'activity_type' => '`activity_type` varchar(255)',
+      'activity_type_id' => '`activity_type_id` varchar(16)',
+      'activity_subject' => '`activity_subject` varchar(255)',
+      'activity_date_time' => '`activity_date_time` varchar(32)',
+      'activity_duration' => '`activity_duration` varchar(16)',
+      '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)',
+      'result' => '`result` text',
+      'activity_engagement_level' => '`activity_engagement_level` varchar(16)',
+      'parent_id' => '`parent_id` varchar(255)',
     ];
   }
 
@@ -2608,27 +2608,27 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   protected function getParticipantSqlColumns() {
     return [
-      'event_id' => 'event_id varchar(16)',
-      '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_status' => 'participant_status varchar(255)',
-      'participant_status_id' => 'participant_status_id varchar(16)',
-      'participant_role' => 'participant_role varchar(255)',
-      'participant_role_id' => 'participant_role_id varchar(128)',
-      'participant_note' => 'participant_note text',
-      '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_fee_amount' => 'participant_fee_amount varchar(32)',
-      'participant_discount_name' => 'participant_discount_name varchar(16)',
-      '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)',
+      'event_id' => '`event_id` varchar(16)',
+      '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_status' => '`participant_status` varchar(255)',
+      'participant_status_id' => '`participant_status_id` varchar(16)',
+      'participant_role' => '`participant_role` varchar(255)',
+      'participant_role_id' => '`participant_role_id` varchar(128)',
+      'participant_note' => '`participant_note` text',
+      '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_fee_amount' => '`participant_fee_amount` varchar(32)',
+      'participant_discount_name' => '`participant_discount_name` varchar(16)',
+      '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)',
     ];
   }
 
@@ -2639,119 +2639,119 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   public function getContributionSqlColumns() {
     return [
-      'civicrm_primary_id' => 'civicrm_primary_id varchar(16)',
-      '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)',
-      'legal_identifier' => 'legal_identifier varchar(32)',
-      'external_identifier' => 'external_identifier varchar(64)',
-      'sort_name' => 'sort_name varchar(128)',
-      'display_name' => 'display_name varchar(128)',
-      'nick_name' => 'nick_name varchar(128)',
-      'legal_name' => 'legal_name varchar(128)',
-      '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(8)',
-      'hash' => 'hash varchar(32)',
-      'contact_source' => 'contact_source varchar(255)',
-      'first_name' => 'first_name varchar(64)',
-      'middle_name' => 'middle_name varchar(64)',
-      'last_name' => 'last_name varchar(64)',
-      'prefix_id' => 'prefix_id varchar(255)',
-      '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)',
-      'job_title' => 'job_title varchar(255)',
-      'gender_id' => 'gender_id varchar(255)',
-      'birth_date' => 'birth_date varchar(32)',
-      'is_deceased' => 'is_deceased varchar(16)',
-      '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)',
-      'created_date' => 'created_date varchar(32)',
-      'modified_date' => 'modified_date varchar(32)',
-      'addressee' => 'addressee varchar(255)',
-      'email_greeting' => 'email_greeting varchar(255)',
-      'postal_greeting' => 'postal_greeting varchar(255)',
-      'current_employer' => 'current_employer varchar(128)',
-      'location_type' => 'location_type text',
-      'street_address' => 'street_address varchar(96)',
-      'street_number' => 'street_number varchar(16)',
-      'street_number_suffix' => 'street_number_suffix varchar(8)',
-      'street_name' => 'street_name varchar(64)',
-      'street_unit' => 'street_unit varchar(16)',
-      'supplemental_address_1' => 'supplemental_address_1 varchar(96)',
-      'supplemental_address_2' => 'supplemental_address_2 varchar(96)',
-      'supplemental_address_3' => 'supplemental_address_3 varchar(96)',
-      'city' => 'city varchar(64)',
-      'postal_code_suffix' => 'postal_code_suffix varchar(12)',
-      'postal_code' => 'postal_code varchar(64)',
-      'geo_code_1' => 'geo_code_1 varchar(32)',
-      'geo_code_2' => 'geo_code_2 varchar(32)',
-      'address_name' => 'address_name varchar(255)',
-      'master_id' => 'master_id varchar(128)',
-      'county' => 'county varchar(64)',
-      'state_province' => 'state_province varchar(64)',
-      'country' => 'country varchar(64)',
-      '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)',
-      'signature_text' => 'signature_text longtext',
-      'signature_html' => 'signature_html longtext',
-      'im_provider' => 'im_provider text',
-      'im_screen_name' => 'im_screen_name varchar(64)',
-      'openid' => 'openid varchar(255)',
-      'world_region' => 'world_region varchar(128)',
-      'url' => 'url varchar(128)',
-      'phone_type_id' => 'phone_type_id varchar(16)',
-      'financial_type' => 'financial_type varchar(255)',
-      'contribution_source' => 'contribution_source varchar(255)',
-      'receive_date' => 'receive_date varchar(32)',
-      'thankyou_date' => 'thankyou_date varchar(32)',
-      'contribution_cancel_date' => 'contribution_cancel_date varchar(32)',
-      '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)',
-      'contribution_check_number' => 'contribution_check_number varchar(255)',
-      'non_deductible_amount' => 'non_deductible_amount varchar(32)',
-      'fee_amount' => 'fee_amount varchar(32)',
-      'net_amount' => 'net_amount varchar(32)',
-      'trxn_id' => 'trxn_id varchar(255)',
-      'invoice_id' => 'invoice_id varchar(255)',
-      'invoice_number' => 'invoice_number varchar(255)',
-      '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)',
-      'contribution_status' => 'contribution_status varchar(255)',
-      'contribution_recur_id' => 'contribution_recur_id varchar(16)',
-      'amount_level' => 'amount_level longtext',
-      'contribution_note' => 'contribution_note text',
-      'contribution_batch' => 'contribution_batch text',
-      'contribution_campaign_title' => 'contribution_campaign_title varchar(255)',
-      'contribution_campaign_id' => 'contribution_campaign_id varchar(16)',
-      'contribution_soft_credit_name' => 'contribution_soft_credit_name varchar(255)',
-      'contribution_soft_credit_amount' => 'contribution_soft_credit_amount varchar(255)',
-      'contribution_soft_credit_type' => 'contribution_soft_credit_type varchar(255)',
-      'contribution_soft_credit_contact_id' => 'contribution_soft_credit_contact_id varchar(255)',
-      'contribution_soft_credit_contribution_id' => 'contribution_soft_credit_contribution_id varchar(255)',
+      'civicrm_primary_id' => '`civicrm_primary_id` varchar(16)',
+      '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)',
+      'legal_identifier' => '`legal_identifier` varchar(32)',
+      'external_identifier' => '`external_identifier` varchar(64)',
+      'sort_name' => '`sort_name` varchar(128)',
+      'display_name' => '`display_name` varchar(128)',
+      'nick_name' => '`nick_name` varchar(128)',
+      'legal_name' => '`legal_name` varchar(128)',
+      '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(8)',
+      'hash' => '`hash` varchar(32)',
+      'contact_source' => '`contact_source` varchar(255)',
+      'first_name' => '`first_name` varchar(64)',
+      'middle_name' => '`middle_name` varchar(64)',
+      'last_name' => '`last_name` varchar(64)',
+      'prefix_id' => '`prefix_id` varchar(255)',
+      '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)',
+      'job_title' => '`job_title` varchar(255)',
+      'gender_id' => '`gender_id` varchar(255)',
+      'birth_date' => '`birth_date` varchar(32)',
+      'is_deceased' => '`is_deceased` varchar(16)',
+      '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)',
+      'created_date' => '`created_date` varchar(32)',
+      'modified_date' => '`modified_date` varchar(32)',
+      'addressee' => '`addressee` varchar(255)',
+      'email_greeting' => '`email_greeting` varchar(255)',
+      'postal_greeting' => '`postal_greeting` varchar(255)',
+      'current_employer' => '`current_employer` varchar(128)',
+      'location_type' => '`location_type` text',
+      'street_address' => '`street_address` varchar(96)',
+      'street_number' => '`street_number` varchar(16)',
+      'street_number_suffix' => '`street_number_suffix` varchar(8)',
+      'street_name' => '`street_name` varchar(64)',
+      'street_unit' => '`street_unit` varchar(16)',
+      'supplemental_address_1' => '`supplemental_address_1` varchar(96)',
+      'supplemental_address_2' => '`supplemental_address_2` varchar(96)',
+      'supplemental_address_3' => '`supplemental_address_3` varchar(96)',
+      'city' => '`city` varchar(64)',
+      'postal_code_suffix' => '`postal_code_suffix` varchar(12)',
+      'postal_code' => '`postal_code` varchar(64)',
+      'geo_code_1' => '`geo_code_1` varchar(32)',
+      'geo_code_2' => '`geo_code_2` varchar(32)',
+      'address_name' => '`address_name` varchar(255)',
+      'master_id' => '`master_id` varchar(128)',
+      'county' => '`county` varchar(64)',
+      'state_province' => '`state_province` varchar(64)',
+      'country' => '`country` varchar(64)',
+      '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)',
+      'signature_text' => '`signature_text` longtext',
+      'signature_html' => '`signature_html` longtext',
+      'im_provider' => '`im_provider` text',
+      'im_screen_name' => '`im_screen_name` varchar(64)',
+      'openid' => '`openid` varchar(255)',
+      'world_region' => '`world_region` varchar(128)',
+      'url' => '`url` varchar(128)',
+      'phone_type_id' => '`phone_type_id` varchar(16)',
+      'financial_type' => '`financial_type` varchar(255)',
+      'contribution_source' => '`contribution_source` varchar(255)',
+      'receive_date' => '`receive_date` varchar(32)',
+      'thankyou_date' => '`thankyou_date` varchar(32)',
+      'contribution_cancel_date' => '`contribution_cancel_date` varchar(32)',
+      '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)',
+      'contribution_check_number' => '`contribution_check_number` varchar(255)',
+      'non_deductible_amount' => '`non_deductible_amount` varchar(32)',
+      'fee_amount' => '`fee_amount` varchar(32)',
+      'net_amount' => '`net_amount` varchar(32)',
+      'trxn_id' => '`trxn_id` varchar(255)',
+      'invoice_id' => '`invoice_id` varchar(255)',
+      'invoice_number' => '`invoice_number` varchar(255)',
+      '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)',
+      'contribution_status' => '`contribution_status` varchar(255)',
+      'contribution_recur_id' => '`contribution_recur_id` varchar(16)',
+      'amount_level' => '`amount_level` longtext',
+      'contribution_note' => '`contribution_note` text',
+      'contribution_batch' => '`contribution_batch` text',
+      'contribution_campaign_title' => '`contribution_campaign_title` varchar(255)',
+      'contribution_campaign_id' => '`contribution_campaign_id` varchar(16)',
+      'contribution_soft_credit_name' => '`contribution_soft_credit_name` varchar(255)',
+      'contribution_soft_credit_amount' => '`contribution_soft_credit_amount` varchar(255)',
+      'contribution_soft_credit_type' => '`contribution_soft_credit_type` varchar(255)',
+      'contribution_soft_credit_contact_id' => '`contribution_soft_credit_contact_id` varchar(255)',
+      'contribution_soft_credit_contribution_id' => '`contribution_soft_credit_contribution_id` varchar(255)',
     ];
   }
 
@@ -2762,30 +2762,30 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   public function getPledgeSqlColumns() {
     return [
-      'pledge_id' => 'pledge_id varchar(16)',
-      'pledge_amount' => 'pledge_amount varchar(32)',
-      'pledge_total_paid' => 'pledge_total_paid text',
-      'pledge_create_date' => 'pledge_create_date varchar(32)',
-      'pledge_start_date' => 'pledge_start_date varchar(32)',
-      '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(255)',
-      'pledge_financial_type' => 'pledge_financial_type text',
-      'pledge_frequency_interval' => 'pledge_frequency_interval varchar(255)',
-      'pledge_frequency_unit' => 'pledge_frequency_unit varchar(255)',
-      'pledge_currency' => 'pledge_currency text',
-      'pledge_campaign_id' => 'pledge_campaign_id varchar(16)',
-      'pledge_balance_amount' => 'pledge_balance_amount text',
-      'pledge_payment_id' => 'pledge_payment_id varchar(16)',
-      '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_status' => 'pledge_payment_status varchar(255)',
+      'pledge_id' => '`pledge_id` varchar(16)',
+      'pledge_amount' => '`pledge_amount` varchar(32)',
+      'pledge_total_paid' => '`pledge_total_paid` text',
+      'pledge_create_date' => '`pledge_create_date` varchar(32)',
+      'pledge_start_date' => '`pledge_start_date` varchar(32)',
+      '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(255)',
+      'pledge_financial_type' => '`pledge_financial_type` text',
+      'pledge_frequency_interval' => '`pledge_frequency_interval` varchar(255)',
+      'pledge_frequency_unit' => '`pledge_frequency_unit` varchar(255)',
+      'pledge_currency' => '`pledge_currency` text',
+      'pledge_campaign_id' => '`pledge_campaign_id` varchar(16)',
+      'pledge_balance_amount' => '`pledge_balance_amount` text',
+      'pledge_payment_id' => '`pledge_payment_id` varchar(16)',
+      '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_status' => '`pledge_payment_status` varchar(255)',
     ];
   }
 
@@ -2796,20 +2796,20 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
    */
   public function getMembershipSqlColumns() {
     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)',
-      '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_type' => '`membership_type` varchar(128)',
+      'member_is_test' => '`member_is_test` varchar(16)',
+      'member_is_pay_later' => '`member_is_pay_later` varchar(16)',
+      '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)',
     ];
   }