From 5fb0de1ffbb12c0efa90635dc639114843702d84 Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Wed, 22 Sep 2021 10:11:26 -0400 Subject: [PATCH] curious --- CRM/Activity/DAO/Activity.php | 4 ++-- CRM/Campaign/DAO/Campaign.php | 6 +++--- CRM/Campaign/DAO/CampaignGroup.php | 6 +++--- CRM/Campaign/DAO/Survey.php | 12 ++++++------ CRM/Case/DAO/Case.php | 2 +- CRM/Contact/DAO/Contact.php | 2 +- CRM/Contact/DAO/Group.php | 4 ++-- CRM/Contact/DAO/Relationship.php | 2 +- CRM/Contact/DAO/SavedSearch.php | 4 ++-- CRM/Contribute/DAO/Contribution.php | 2 +- CRM/Contribute/DAO/ContributionPage.php | 4 ++-- CRM/Contribute/DAO/ContributionProduct.php | 2 +- CRM/Contribute/DAO/ContributionRecur.php | 2 +- CRM/Contribute/DAO/ContributionSoft.php | 10 +++++----- CRM/Contribute/DAO/PremiumsProduct.php | 2 +- CRM/Contribute/DAO/Product.php | 4 ++-- CRM/Core/DAO/ActionLog.php | 2 +- CRM/Core/DAO/ActionSchedule.php | 2 +- CRM/Core/DAO/Cache.php | 2 +- CRM/Core/DAO/CustomGroup.php | 4 ++-- CRM/Core/DAO/Email.php | 4 ++-- CRM/Core/DAO/Job.php | 4 ++-- CRM/Core/DAO/Navigation.php | 2 +- CRM/Core/DAO/OptionValue.php | 6 +++--- CRM/Core/DAO/StatusPreference.php | 2 +- CRM/Core/DAO/Tag.php | 6 +++--- CRM/Core/DAO/UFGroup.php | 4 ++-- CRM/Cxn/DAO/Cxn.php | 4 ++-- CRM/Event/DAO/Event.php | 16 ++++++++-------- CRM/Event/DAO/Participant.php | 10 +++++----- CRM/Financial/DAO/FinancialTrxn.php | 4 ++-- CRM/Financial/DAO/PaymentProcessor.php | 2 +- CRM/Grant/DAO/Grant.php | 2 +- CRM/Mailing/DAO/Mailing.php | 4 ++-- CRM/Mailing/DAO/MailingJob.php | 8 ++++---- CRM/Mailing/DAO/Recipients.php | 4 ++-- CRM/Mailing/DAO/Spool.php | 4 ++-- CRM/Mailing/Event/DAO/Queue.php | 4 ++-- CRM/Member/DAO/Membership.php | 2 +- CRM/PCP/DAO/PCP.php | 10 +++++----- CRM/PCP/DAO/PCPBlock.php | 12 ++++++------ CRM/Pledge/DAO/Pledge.php | 2 +- CRM/Pledge/DAO/PledgePayment.php | 2 +- CRM/Price/DAO/LineItem.php | 10 +++++----- CRM/Price/DAO/PriceField.php | 4 ++-- CRM/Price/DAO/PriceFieldValue.php | 20 ++++++++++---------- CRM/Price/DAO/PriceSet.php | 2 +- xml/templates/dao.tpl | 3 ++- 48 files changed, 118 insertions(+), 117 deletions(-) diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php index a3cf77585f..d42bda6d99 100644 --- a/CRM/Activity/DAO/Activity.php +++ b/CRM/Activity/DAO/Activity.php @@ -561,7 +561,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'title' => ts('Activity Medium'), 'description' => ts('Activity Medium, Implicit FK to civicrm_option_value where option_group = encounter_medium.'), 'where' => 'civicrm_activity.medium_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_activity', 'entity' => 'Activity', 'bao' => 'CRM_Activity_BAO_Activity', @@ -593,7 +593,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'title' => ts('Relationship ID'), 'description' => ts('FK to Relationship ID'), 'where' => 'civicrm_activity.relationship_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_activity', 'entity' => 'Activity', 'bao' => 'CRM_Activity_BAO_Activity', diff --git a/CRM/Campaign/DAO/Campaign.php b/CRM/Campaign/DAO/Campaign.php index 882f5b8ded..a82c6fb444 100644 --- a/CRM/Campaign/DAO/Campaign.php +++ b/CRM/Campaign/DAO/Campaign.php @@ -348,7 +348,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_campaign.campaign_type_id', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', 'bao' => 'CRM_Campaign_BAO_Campaign', @@ -370,7 +370,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_campaign.status_id', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', 'bao' => 'CRM_Campaign_BAO_Campaign', @@ -413,7 +413,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_campaign.parent_id', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_campaign', 'entity' => 'Campaign', 'bao' => 'CRM_Campaign_BAO_Campaign', diff --git a/CRM/Campaign/DAO/CampaignGroup.php b/CRM/Campaign/DAO/CampaignGroup.php index 0e559e1d1d..cc967826b4 100644 --- a/CRM/Campaign/DAO/CampaignGroup.php +++ b/CRM/Campaign/DAO/CampaignGroup.php @@ -157,7 +157,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO { 'maxlength' => 8, 'size' => CRM_Utils_Type::EIGHT, 'where' => 'civicrm_campaign_group.group_type', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_campaign_group', 'entity' => 'CampaignGroup', 'bao' => 'CRM_Campaign_DAO_CampaignGroup', @@ -178,7 +178,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO { 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, 'where' => 'civicrm_campaign_group.entity_table', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_campaign_group', 'entity' => 'CampaignGroup', 'bao' => 'CRM_Campaign_DAO_CampaignGroup', @@ -191,7 +191,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO { 'title' => ts('Entity ID'), 'description' => ts('Entity id of referenced table.'), 'where' => 'civicrm_campaign_group.entity_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_campaign_group', 'entity' => 'CampaignGroup', 'bao' => 'CRM_Campaign_DAO_CampaignGroup', diff --git a/CRM/Campaign/DAO/Survey.php b/CRM/Campaign/DAO/Survey.php index bc051c862c..83573a7148 100644 --- a/CRM/Campaign/DAO/Survey.php +++ b/CRM/Campaign/DAO/Survey.php @@ -268,7 +268,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'title' => ts('Campaign ID'), 'description' => ts('Foreign key to the Campaign.'), 'where' => 'civicrm_survey.campaign_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -294,7 +294,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_survey.activity_type_id', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -348,7 +348,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'title' => ts('Survey Hold Duration'), 'description' => ts('Number of days for recurrence of release.'), 'where' => 'civicrm_survey.release_frequency', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -361,7 +361,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'title' => ts('Maximum number of contacts'), 'description' => ts('Maximum number of contacts to allow for survey.'), 'where' => 'civicrm_survey.max_number_of_contacts', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -374,7 +374,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'title' => ts('Default number of contacts'), 'description' => ts('Default number of contacts to allow for survey.'), 'where' => 'civicrm_survey.default_number_of_contacts', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', @@ -469,7 +469,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO { 'title' => ts('Survey Result'), 'description' => ts('Used to store option group id.'), 'where' => 'civicrm_survey.result_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_survey', 'entity' => 'Survey', 'bao' => 'CRM_Campaign_BAO_Survey', diff --git a/CRM/Case/DAO/Case.php b/CRM/Case/DAO/Case.php index 9d5a50a433..f787bdd65d 100644 --- a/CRM/Case/DAO/Case.php +++ b/CRM/Case/DAO/Case.php @@ -327,7 +327,7 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO { 'required' => FALSE, 'where' => 'civicrm_case.created_date', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_case', 'entity' => 'Case', 'bao' => 'CRM_Case_BAO_Case', diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php index 2d92c545d6..860e6e9c50 100644 --- a/CRM/Contact/DAO/Contact.php +++ b/CRM/Contact/DAO/Contact.php @@ -1521,7 +1521,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'required' => FALSE, 'where' => 'civicrm_contact.created_date', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_contact', 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', diff --git a/CRM/Contact/DAO/Group.php b/CRM/Contact/DAO/Group.php index 5631e77581..197127e341 100644 --- a/CRM/Contact/DAO/Group.php +++ b/CRM/Contact/DAO/Group.php @@ -558,7 +558,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_group.frontend_title', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', @@ -576,7 +576,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { 'rows' => 2, 'cols' => 60, 'where' => 'civicrm_group.frontend_description', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_group', 'entity' => 'Group', 'bao' => 'CRM_Contact_BAO_Group', diff --git a/CRM/Contact/DAO/Relationship.php b/CRM/Contact/DAO/Relationship.php index 5c2783fcee..ed4dfb7a47 100644 --- a/CRM/Contact/DAO/Relationship.php +++ b/CRM/Contact/DAO/Relationship.php @@ -355,7 +355,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO { 'title' => ts('Case ID'), 'description' => ts('FK to civicrm_case'), 'where' => 'civicrm_relationship.case_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_relationship', 'entity' => 'Relationship', 'bao' => 'CRM_Contact_BAO_Relationship', diff --git a/CRM/Contact/DAO/SavedSearch.php b/CRM/Contact/DAO/SavedSearch.php index c8fff17301..41fda3afb0 100644 --- a/CRM/Contact/DAO/SavedSearch.php +++ b/CRM/Contact/DAO/SavedSearch.php @@ -194,7 +194,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_saved_search.name', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_saved_search', 'entity' => 'SavedSearch', 'bao' => 'CRM_Contact_BAO_SavedSearch', @@ -212,7 +212,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_saved_search.label', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_saved_search', 'entity' => 'SavedSearch', 'bao' => 'CRM_Contact_BAO_SavedSearch', diff --git a/CRM/Contribute/DAO/Contribution.php b/CRM/Contribute/DAO/Contribution.php index 91ad894806..b9093b4986 100644 --- a/CRM/Contribute/DAO/Contribution.php +++ b/CRM/Contribute/DAO/Contribution.php @@ -611,7 +611,7 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'headerPattern' => '/cur(rency)?/i', 'dataPattern' => '/^[A-Z]{3}$/i', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_contribution', 'entity' => 'Contribution', 'bao' => 'CRM_Contribute_BAO_Contribution', diff --git a/CRM/Contribute/DAO/ContributionPage.php b/CRM/Contribute/DAO/ContributionPage.php index 83270c9b3d..6af62986b0 100644 --- a/CRM/Contribute/DAO/ContributionPage.php +++ b/CRM/Contribute/DAO/ContributionPage.php @@ -1026,7 +1026,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'where' => 'civicrm_contribution_page.currency', 'headerPattern' => '/cur(rency)?/i', 'dataPattern' => '/^[A-Z]{3}$/i', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', @@ -1101,7 +1101,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_contribution_page.frontend_title', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_contribution_page', 'entity' => 'ContributionPage', 'bao' => 'CRM_Contribute_BAO_ContributionPage', diff --git a/CRM/Contribute/DAO/ContributionProduct.php b/CRM/Contribute/DAO/ContributionProduct.php index 010117db25..6b90bff589 100644 --- a/CRM/Contribute/DAO/ContributionProduct.php +++ b/CRM/Contribute/DAO/ContributionProduct.php @@ -266,7 +266,7 @@ class CRM_Contribute_DAO_ContributionProduct extends CRM_Core_DAO { 'title' => ts('Financial Type ID'), 'description' => ts('FK to Financial Type(for membership price sets only).'), 'where' => 'civicrm_contribution_product.financial_type_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_contribution_product', 'entity' => 'ContributionProduct', 'bao' => 'CRM_Contribute_DAO_ContributionProduct', diff --git a/CRM/Contribute/DAO/ContributionRecur.php b/CRM/Contribute/DAO/ContributionRecur.php index a1ebe04336..822ce923cc 100644 --- a/CRM/Contribute/DAO/ContributionRecur.php +++ b/CRM/Contribute/DAO/ContributionRecur.php @@ -338,7 +338,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, 'where' => 'civicrm_contribution_recur.currency', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_contribution_recur', 'entity' => 'ContributionRecur', 'bao' => 'CRM_Contribute_BAO_ContributionRecur', diff --git a/CRM/Contribute/DAO/ContributionSoft.php b/CRM/Contribute/DAO/ContributionSoft.php index 6bf05ba685..d41e62bb5e 100644 --- a/CRM/Contribute/DAO/ContributionSoft.php +++ b/CRM/Contribute/DAO/ContributionSoft.php @@ -224,7 +224,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, 'where' => 'civicrm_contribution_soft.currency', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', 'bao' => 'CRM_Contribute_BAO_ContributionSoft', @@ -247,7 +247,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'title' => ts('PCP ID'), 'description' => ts('FK to civicrm_pcp.id'), 'where' => 'civicrm_contribution_soft.pcp_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', 'bao' => 'CRM_Contribute_BAO_ContributionSoft', @@ -282,7 +282,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_contribution_soft.pcp_roll_nickname', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', 'bao' => 'CRM_Contribute_BAO_ContributionSoft', @@ -296,7 +296,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_contribution_soft.pcp_personal_note', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', 'bao' => 'CRM_Contribute_BAO_ContributionSoft', @@ -312,7 +312,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { 'title' => ts('Soft Credit Type'), 'description' => ts('Soft Credit Type ID.Implicit FK to civicrm_option_value where option_group = soft_credit_type.'), 'where' => 'civicrm_contribution_soft.soft_credit_type_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_contribution_soft', 'entity' => 'ContributionSoft', 'bao' => 'CRM_Contribute_BAO_ContributionSoft', diff --git a/CRM/Contribute/DAO/PremiumsProduct.php b/CRM/Contribute/DAO/PremiumsProduct.php index 35e0db7a97..29c595b380 100644 --- a/CRM/Contribute/DAO/PremiumsProduct.php +++ b/CRM/Contribute/DAO/PremiumsProduct.php @@ -176,7 +176,7 @@ class CRM_Contribute_DAO_PremiumsProduct extends CRM_Core_DAO { 'title' => ts('Financial Type ID'), 'description' => ts('FK to Financial Type.'), 'where' => 'civicrm_premiums_product.financial_type_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_premiums_product', 'entity' => 'PremiumsProduct', 'bao' => 'CRM_Contribute_DAO_PremiumsProduct', diff --git a/CRM/Contribute/DAO/Product.php b/CRM/Contribute/DAO/Product.php index 4261da5bdc..81b1ef81b2 100644 --- a/CRM/Contribute/DAO/Product.php +++ b/CRM/Contribute/DAO/Product.php @@ -332,7 +332,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, 'where' => 'civicrm_product.currency', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', @@ -356,7 +356,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO { 'title' => ts('Financial Type ID'), 'description' => ts('FK to Financial Type.'), 'where' => 'civicrm_product.financial_type_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_product', 'entity' => 'Product', 'bao' => 'CRM_Contribute_BAO_Product', diff --git a/CRM/Core/DAO/ActionLog.php b/CRM/Core/DAO/ActionLog.php index 3d9b0315cf..3857d49fbf 100644 --- a/CRM/Core/DAO/ActionLog.php +++ b/CRM/Core/DAO/ActionLog.php @@ -272,7 +272,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO { 'title' => ts('Reference Date'), 'description' => ts('Stores the date from the entity which triggered this reminder action (e.g. membership.end_date for most membership renewal reminders)'), 'where' => 'civicrm_action_log.reference_date', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_action_log', 'entity' => 'ActionLog', 'bao' => 'CRM_Core_BAO_ActionLog', diff --git a/CRM/Core/DAO/ActionSchedule.php b/CRM/Core/DAO/ActionSchedule.php index a58346853a..5f6a148e4b 100644 --- a/CRM/Core/DAO/ActionSchedule.php +++ b/CRM/Core/DAO/ActionSchedule.php @@ -763,7 +763,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO { 'title' => ts('Record Activity for Reminder?'), 'description' => ts('Record Activity for this reminder?'), 'where' => 'civicrm_action_schedule.record_activity', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_action_schedule', 'entity' => 'ActionSchedule', 'bao' => 'CRM_Core_BAO_ActionSchedule', diff --git a/CRM/Core/DAO/Cache.php b/CRM/Core/DAO/Cache.php index b1e3978b7e..981ceebaad 100644 --- a/CRM/Core/DAO/Cache.php +++ b/CRM/Core/DAO/Cache.php @@ -220,7 +220,7 @@ class CRM_Core_DAO_Cache extends CRM_Core_DAO { 'description' => ts('When should the cache item expire'), 'required' => FALSE, 'where' => 'civicrm_cache.expired_date', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_cache', 'entity' => 'Cache', 'bao' => 'CRM_Core_BAO_Cache', diff --git a/CRM/Core/DAO/CustomGroup.php b/CRM/Core/DAO/CustomGroup.php index 0ffa8fe4cd..94da2fa579 100644 --- a/CRM/Core/DAO/CustomGroup.php +++ b/CRM/Core/DAO/CustomGroup.php @@ -299,7 +299,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'title' => ts('Custom Group Subtype List'), 'description' => ts('FK to civicrm_option_value.id (for option group custom_data_type.)'), 'where' => 'civicrm_custom_group.extends_entity_column_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', @@ -552,7 +552,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_custom_group.icon', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_custom_group', 'entity' => 'CustomGroup', 'bao' => 'CRM_Core_BAO_CustomGroup', diff --git a/CRM/Core/DAO/Email.php b/CRM/Core/DAO/Email.php index 53180904db..81f8f4259a 100644 --- a/CRM/Core/DAO/Email.php +++ b/CRM/Core/DAO/Email.php @@ -351,7 +351,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_email.signature_text', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_email', 'entity' => 'Email', 'bao' => 'CRM_Core_BAO_Email', @@ -369,7 +369,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_email.signature_html', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_email', 'entity' => 'Email', 'bao' => 'CRM_Core_BAO_Email', diff --git a/CRM/Core/DAO/Job.php b/CRM/Core/DAO/Job.php index 284cb4da1b..878a316811 100644 --- a/CRM/Core/DAO/Job.php +++ b/CRM/Core/DAO/Job.php @@ -215,7 +215,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'description' => ts('When was this cron entry last run'), 'required' => FALSE, 'where' => 'civicrm_job.last_run', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_job', 'entity' => 'Job', 'bao' => 'CRM_Core_BAO_Job', @@ -232,7 +232,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO { 'description' => ts('When is this cron entry scheduled to run'), 'required' => FALSE, 'where' => 'civicrm_job.scheduled_run_date', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_job', 'entity' => 'Job', 'bao' => 'CRM_Core_BAO_Job', diff --git a/CRM/Core/DAO/Navigation.php b/CRM/Core/DAO/Navigation.php index ab154b8353..17a36917d8 100644 --- a/CRM/Core/DAO/Navigation.php +++ b/CRM/Core/DAO/Navigation.php @@ -250,7 +250,7 @@ class CRM_Core_DAO_Navigation extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_navigation.icon', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_navigation', 'entity' => 'Navigation', 'bao' => 'CRM_Core_BAO_Navigation', diff --git a/CRM/Core/DAO/OptionValue.php b/CRM/Core/DAO/OptionValue.php index e421d63a2a..32e90f667e 100644 --- a/CRM/Core/DAO/OptionValue.php +++ b/CRM/Core/DAO/OptionValue.php @@ -441,7 +441,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Option Visibility'), 'where' => 'civicrm_option_value.visibility_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -460,7 +460,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_option_value.icon', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', @@ -475,7 +475,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_option_value.color', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_option_value', 'entity' => 'OptionValue', 'bao' => 'CRM_Core_BAO_OptionValue', diff --git a/CRM/Core/DAO/StatusPreference.php b/CRM/Core/DAO/StatusPreference.php index 58146b7396..4b3b3e0fc5 100644 --- a/CRM/Core/DAO/StatusPreference.php +++ b/CRM/Core/DAO/StatusPreference.php @@ -191,7 +191,7 @@ class CRM_Core_DAO_StatusPreference extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_status_pref.hush_until', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_status_pref', 'entity' => 'StatusPreference', 'bao' => 'CRM_Core_BAO_StatusPreference', diff --git a/CRM/Core/DAO/Tag.php b/CRM/Core/DAO/Tag.php index 4886437cfe..fb94ad6d9d 100644 --- a/CRM/Core/DAO/Tag.php +++ b/CRM/Core/DAO/Tag.php @@ -209,7 +209,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'title' => ts('Parent Tag ID'), 'description' => ts('Optional parent id for this tag.'), 'where' => 'civicrm_tag.parent_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_tag', 'entity' => 'Tag', 'bao' => 'CRM_Core_BAO_Tag', @@ -269,7 +269,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, 'where' => 'civicrm_tag.used_for', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_tag', 'entity' => 'Tag', 'bao' => 'CRM_Core_BAO_Tag', @@ -308,7 +308,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_tag.color', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_tag', 'entity' => 'Tag', 'bao' => 'CRM_Core_BAO_Tag', diff --git a/CRM/Core/DAO/UFGroup.php b/CRM/Core/DAO/UFGroup.php index a7dccae40d..919b38ac9c 100644 --- a/CRM/Core/DAO/UFGroup.php +++ b/CRM/Core/DAO/UFGroup.php @@ -621,7 +621,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, 'where' => 'civicrm_uf_group.cancel_button_text', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', @@ -639,7 +639,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'maxlength' => 64, 'size' => CRM_Utils_Type::BIG, 'where' => 'civicrm_uf_group.submit_button_text', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_uf_group', 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', diff --git a/CRM/Cxn/DAO/Cxn.php b/CRM/Cxn/DAO/Cxn.php index 1edc4fb456..e5c70d9f7e 100644 --- a/CRM/Cxn/DAO/Cxn.php +++ b/CRM/Cxn/DAO/Cxn.php @@ -256,7 +256,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'description' => ts('When was the connection was created.'), 'required' => FALSE, 'where' => 'civicrm_cxn.created_date', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', 'bao' => 'CRM_Cxn_BAO_Cxn', @@ -291,7 +291,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO { 'description' => ts('The last time the application metadata was fetched.'), 'required' => FALSE, 'where' => 'civicrm_cxn.fetched_date', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_cxn', 'entity' => 'Cxn', 'bao' => 'CRM_Cxn_BAO_Cxn', diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php index 0b340c956f..fe3a66fa99 100644 --- a/CRM/Event/DAO/Event.php +++ b/CRM/Event/DAO/Event.php @@ -686,7 +686,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'title' => ts('Participant Listing'), 'description' => ts('Should we expose the participant list? Implicit FK to civicrm_option_value where option_group = participant_listing.'), 'where' => 'civicrm_event.participant_listing_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -827,7 +827,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'title' => ts('Max Participants'), 'description' => ts('Maximum number of registered participants to allow. After max is reached, a custom Event Full message is displayed. If NULL, allow unlimited number of participants.'), 'where' => 'civicrm_event.max_participants', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -876,7 +876,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'title' => ts('Financial Type'), 'description' => ts('Financial type assigned to paid event registrations for this event. Required if is_monetary is true.'), 'where' => 'civicrm_event.financial_type_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1062,7 +1062,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_event.confirm_title', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1241,7 +1241,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_event.thankyou_title', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1714,7 +1714,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'title' => ts('Parent Event ID'), 'description' => ts('Implicit FK to civicrm_event: parent event'), 'where' => 'civicrm_event.parent_event_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1730,7 +1730,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'title' => ts('Subevent Slot Label ID'), 'description' => ts('Subevent slot label. Implicit FK to civicrm_option_value where option_group = conference_slot.'), 'where' => 'civicrm_event.slot_label_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', @@ -1746,7 +1746,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { 'title' => ts('Dedupe Rule ID'), 'description' => ts('Rule to use when matching registrations for this event'), 'where' => 'civicrm_event.dedupe_rule_group_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_event', 'entity' => 'Event', 'bao' => 'CRM_Event_BAO_Event', diff --git a/CRM/Event/DAO/Participant.php b/CRM/Event/DAO/Participant.php index 1dd50ba91d..67278329c8 100644 --- a/CRM/Event/DAO/Participant.php +++ b/CRM/Event/DAO/Participant.php @@ -323,7 +323,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'where' => 'civicrm_participant.role_id', 'headerPattern' => '/(participant.)?(role)$/i', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', 'bao' => 'CRM_Event_BAO_Participant', @@ -452,7 +452,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_participant.registered_by_id', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', 'bao' => 'CRM_Event_BAO_Participant', @@ -469,7 +469,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'title' => ts('Discount ID'), 'description' => ts('FK to Discount ID'), 'where' => 'civicrm_participant.discount_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', 'bao' => 'CRM_Event_BAO_Participant', @@ -492,7 +492,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'headerPattern' => '/(fee)?.?cur(rency)?/i', 'dataPattern' => '/^[A-Z]{3}$/i', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', 'bao' => 'CRM_Event_BAO_Participant', @@ -584,7 +584,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'where' => 'civicrm_participant.transferred_to_contact_id', 'headerPattern' => '/transfer(.?id)?/i', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_participant', 'entity' => 'Participant', 'bao' => 'CRM_Event_BAO_Participant', diff --git a/CRM/Financial/DAO/FinancialTrxn.php b/CRM/Financial/DAO/FinancialTrxn.php index 17f736233b..499098c44e 100644 --- a/CRM/Financial/DAO/FinancialTrxn.php +++ b/CRM/Financial/DAO/FinancialTrxn.php @@ -264,7 +264,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'title' => ts('Financial Transaction Date'), 'description' => ts('date transaction occurred'), 'where' => 'civicrm_financial_trxn.trxn_date', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', @@ -336,7 +336,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'headerPattern' => '/cur(rency)?/i', 'dataPattern' => '/^[A-Z]{3}$/', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_financial_trxn', 'entity' => 'FinancialTrxn', 'bao' => 'CRM_Financial_DAO_FinancialTrxn', diff --git a/CRM/Financial/DAO/PaymentProcessor.php b/CRM/Financial/DAO/PaymentProcessor.php index 47cd88caec..8c86a63342 100644 --- a/CRM/Financial/DAO/PaymentProcessor.php +++ b/CRM/Financial/DAO/PaymentProcessor.php @@ -566,7 +566,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO { 'title' => ts('Accepted Credit Cards'), 'description' => ts('array of accepted credit card types'), 'where' => 'civicrm_payment_processor.accepted_credit_cards', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_payment_processor', 'entity' => 'PaymentProcessor', 'bao' => 'CRM_Financial_BAO_PaymentProcessor', diff --git a/CRM/Grant/DAO/Grant.php b/CRM/Grant/DAO/Grant.php index 41b3abeb61..3337bd12cb 100644 --- a/CRM/Grant/DAO/Grant.php +++ b/CRM/Grant/DAO/Grant.php @@ -491,7 +491,7 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'title' => ts('Financial Type ID'), 'description' => ts('FK to Financial Type.'), 'where' => 'civicrm_grant.financial_type_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_grant', 'entity' => 'Grant', 'bao' => 'CRM_Grant_BAO_Grant', diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php index 3c77c46160..93ec4b8630 100644 --- a/CRM/Mailing/DAO/Mailing.php +++ b/CRM/Mailing/DAO/Mailing.php @@ -897,7 +897,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('Date and time this mailing was scheduled.'), 'required' => FALSE, 'where' => 'civicrm_mailing.scheduled_date', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', @@ -931,7 +931,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'description' => ts('Date and time this mailing was approved.'), 'required' => FALSE, 'where' => 'civicrm_mailing.approval_date', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing', 'entity' => 'Mailing', 'bao' => 'CRM_Mailing_BAO_Mailing', diff --git a/CRM/Mailing/DAO/MailingJob.php b/CRM/Mailing/DAO/MailingJob.php index fb5b2d8748..7058a2751a 100644 --- a/CRM/Mailing/DAO/MailingJob.php +++ b/CRM/Mailing/DAO/MailingJob.php @@ -188,7 +188,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'description' => ts('date on which this job was scheduled.'), 'required' => FALSE, 'where' => 'civicrm_mailing_job.scheduled_date', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', 'bao' => 'CRM_Mailing_BAO_MailingJob', @@ -206,7 +206,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'description' => ts('date on which this job was started.'), 'required' => FALSE, 'where' => 'civicrm_mailing_job.start_date', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', 'bao' => 'CRM_Mailing_BAO_MailingJob', @@ -225,7 +225,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'description' => ts('date on which this job ended.'), 'required' => FALSE, 'where' => 'civicrm_mailing_job.end_date', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', 'bao' => 'CRM_Mailing_BAO_MailingJob', @@ -289,7 +289,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'title' => ts('Parent ID'), 'description' => ts('Parent job id'), 'where' => 'civicrm_mailing_job.parent_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing_job', 'entity' => 'MailingJob', 'bao' => 'CRM_Mailing_BAO_MailingJob', diff --git a/CRM/Mailing/DAO/Recipients.php b/CRM/Mailing/DAO/Recipients.php index 01c79e8ed0..7bc6325be6 100644 --- a/CRM/Mailing/DAO/Recipients.php +++ b/CRM/Mailing/DAO/Recipients.php @@ -164,7 +164,7 @@ class CRM_Mailing_DAO_Recipients extends CRM_Core_DAO { 'title' => ts('Email ID'), 'description' => ts('FK to Email'), 'where' => 'civicrm_mailing_recipients.email_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing_recipients', 'entity' => 'Recipients', 'bao' => 'CRM_Mailing_BAO_Recipients', @@ -181,7 +181,7 @@ class CRM_Mailing_DAO_Recipients extends CRM_Core_DAO { 'title' => ts('Phone ID'), 'description' => ts('FK to Phone'), 'where' => 'civicrm_mailing_recipients.phone_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing_recipients', 'entity' => 'Recipients', 'bao' => 'CRM_Mailing_BAO_Recipients', diff --git a/CRM/Mailing/DAO/Spool.php b/CRM/Mailing/DAO/Spool.php index e222a98fa1..b5a4afc996 100644 --- a/CRM/Mailing/DAO/Spool.php +++ b/CRM/Mailing/DAO/Spool.php @@ -195,7 +195,7 @@ class CRM_Mailing_DAO_Spool extends CRM_Core_DAO { 'description' => ts('date on which this job was added.'), 'required' => FALSE, 'where' => 'civicrm_mailing_spool.added_at', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing_spool', 'entity' => 'Spool', 'bao' => 'CRM_Mailing_BAO_Spool', @@ -209,7 +209,7 @@ class CRM_Mailing_DAO_Spool extends CRM_Core_DAO { 'description' => ts('date on which this job was removed.'), 'required' => FALSE, 'where' => 'civicrm_mailing_spool.removed_at', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing_spool', 'entity' => 'Spool', 'bao' => 'CRM_Mailing_BAO_Spool', diff --git a/CRM/Mailing/Event/DAO/Queue.php b/CRM/Mailing/Event/DAO/Queue.php index fc34ac15a4..c5ef84e299 100644 --- a/CRM/Mailing/Event/DAO/Queue.php +++ b/CRM/Mailing/Event/DAO/Queue.php @@ -154,7 +154,7 @@ class CRM_Mailing_Event_DAO_Queue extends CRM_Core_DAO { 'title' => ts('Email ID'), 'description' => ts('FK to Email'), 'where' => 'civicrm_mailing_event_queue.email_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing_event_queue', 'entity' => 'Queue', 'bao' => 'CRM_Mailing_Event_BAO_Queue', @@ -203,7 +203,7 @@ class CRM_Mailing_Event_DAO_Queue extends CRM_Core_DAO { 'title' => ts('Phone ID'), 'description' => ts('FK to Phone'), 'where' => 'civicrm_mailing_event_queue.phone_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_mailing_event_queue', 'entity' => 'Queue', 'bao' => 'CRM_Mailing_Event_BAO_Queue', diff --git a/CRM/Member/DAO/Membership.php b/CRM/Member/DAO/Membership.php index 51b16d4014..e378b8876e 100644 --- a/CRM/Member/DAO/Membership.php +++ b/CRM/Member/DAO/Membership.php @@ -410,7 +410,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'import' => TRUE, 'where' => 'civicrm_membership.status_override_end_date', 'export' => TRUE, - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_membership', 'entity' => 'Membership', 'bao' => 'CRM_Member_BAO_Membership', diff --git a/CRM/PCP/DAO/PCP.php b/CRM/PCP/DAO/PCP.php index 9c04ed84fd..70d9137abe 100644 --- a/CRM/PCP/DAO/PCP.php +++ b/CRM/PCP/DAO/PCP.php @@ -231,7 +231,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_pcp.title', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', 'bao' => 'CRM_PCP_BAO_PCP', @@ -246,7 +246,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Intro Text'), 'where' => 'civicrm_pcp.intro_text', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', 'bao' => 'CRM_PCP_BAO_PCP', @@ -262,7 +262,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => ts('Page Text'), 'where' => 'civicrm_pcp.page_text', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', 'bao' => 'CRM_PCP_BAO_PCP', @@ -280,7 +280,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_pcp.donate_link_text', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', 'bao' => 'CRM_PCP_BAO_PCP', @@ -391,7 +391,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO { 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, 'where' => 'civicrm_pcp.currency', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pcp', 'entity' => 'PCP', 'bao' => 'CRM_PCP_BAO_PCP', diff --git a/CRM/PCP/DAO/PCPBlock.php b/CRM/PCP/DAO/PCPBlock.php index e1cfd859bb..57c7fc9fa4 100644 --- a/CRM/PCP/DAO/PCPBlock.php +++ b/CRM/PCP/DAO/PCPBlock.php @@ -241,7 +241,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'title' => ts('Supporter Profile ID'), 'description' => ts('FK to civicrm_uf_group.id. Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?'), 'where' => 'civicrm_pcp_block.supporter_profile_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', 'bao' => 'CRM_PCP_BAO_PCPBlock', @@ -278,7 +278,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'title' => ts('Approval Required?'), 'description' => ts('Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?'), 'where' => 'civicrm_pcp_block.is_approval_needed', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', 'bao' => 'CRM_PCP_BAO_PCPBlock', @@ -291,7 +291,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'title' => ts('Tell a Friend Enabled?'), 'description' => ts('Does Personal Campaign Page allow using tell a friend?'), 'where' => 'civicrm_pcp_block.is_tellfriend_enabled', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', 'bao' => 'CRM_PCP_BAO_PCPBlock', @@ -304,7 +304,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'title' => ts('Tell A Friend Limit'), 'description' => ts('Maximum recipient fields allowed in tell a friend'), 'where' => 'civicrm_pcp_block.tellfriend_limit', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', 'bao' => 'CRM_PCP_BAO_PCPBlock', @@ -319,7 +319,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_pcp_block.link_text', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', 'bao' => 'CRM_PCP_BAO_PCPBlock', @@ -347,7 +347,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_pcp_block.notify_email', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pcp_block', 'entity' => 'PCPBlock', 'bao' => 'CRM_PCP_BAO_PCPBlock', diff --git a/CRM/Pledge/DAO/Pledge.php b/CRM/Pledge/DAO/Pledge.php index 7a9a764e43..3fc96ac9f7 100644 --- a/CRM/Pledge/DAO/Pledge.php +++ b/CRM/Pledge/DAO/Pledge.php @@ -378,7 +378,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, 'where' => 'civicrm_pledge.currency', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', 'bao' => 'CRM_Pledge_BAO_Pledge', diff --git a/CRM/Pledge/DAO/PledgePayment.php b/CRM/Pledge/DAO/PledgePayment.php index 0dae73a2f0..f00e378564 100644 --- a/CRM/Pledge/DAO/PledgePayment.php +++ b/CRM/Pledge/DAO/PledgePayment.php @@ -235,7 +235,7 @@ class CRM_Pledge_DAO_PledgePayment extends CRM_Core_DAO { 'maxlength' => 3, 'size' => CRM_Utils_Type::FOUR, 'where' => 'civicrm_pledge_payment.currency', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_pledge_payment', 'entity' => 'PledgePayment', 'bao' => 'CRM_Pledge_BAO_PledgePayment', diff --git a/CRM/Price/DAO/LineItem.php b/CRM/Price/DAO/LineItem.php index 98bae25c61..4255cffa27 100644 --- a/CRM/Price/DAO/LineItem.php +++ b/CRM/Price/DAO/LineItem.php @@ -275,7 +275,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_line_item.label', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -349,7 +349,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'title' => ts('Line Item Participant Count'), 'description' => ts('Participant count for field'), 'where' => 'civicrm_line_item.participant_count', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -365,7 +365,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'title' => ts('Option ID'), 'description' => ts('FK to civicrm_price_field_value'), 'where' => 'civicrm_line_item.price_field_value_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -388,7 +388,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'title' => ts('Financial Type ID'), 'description' => ts('FK to Financial Type.'), 'where' => 'civicrm_line_item.financial_type_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', @@ -457,7 +457,7 @@ class CRM_Price_DAO_LineItem extends CRM_Core_DAO { 'title' => ts('Number of membership terms purchased'), 'description' => ts('Number of terms for this membership (only supported in Order->Payment flow). If the field is NULL it means unknown and it will be assumed to be 1 during payment.create if entity_table is civicrm_membership'), 'where' => 'civicrm_line_item.membership_num_terms', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_line_item', 'entity' => 'LineItem', 'bao' => 'CRM_Price_BAO_LineItem', diff --git a/CRM/Price/DAO/PriceField.php b/CRM/Price/DAO/PriceField.php index 287939e200..157576b0ba 100644 --- a/CRM/Price/DAO/PriceField.php +++ b/CRM/Price/DAO/PriceField.php @@ -423,7 +423,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'title' => ts('Price Field Start Date'), 'description' => ts('If non-zero, do not show this field before the date specified'), 'where' => 'civicrm_price_field.active_on', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', 'bao' => 'CRM_Price_BAO_PriceField', @@ -440,7 +440,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO { 'title' => ts('Price Field End Date'), 'description' => ts('If non-zero, do not show this field after the date specified'), 'where' => 'civicrm_price_field.expire_on', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field', 'entity' => 'PriceField', 'bao' => 'CRM_Price_BAO_PriceField', diff --git a/CRM/Price/DAO/PriceFieldValue.php b/CRM/Price/DAO/PriceFieldValue.php index cda909f202..d43cc16485 100644 --- a/CRM/Price/DAO/PriceFieldValue.php +++ b/CRM/Price/DAO/PriceFieldValue.php @@ -242,7 +242,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_price_field_value.name', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -260,7 +260,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'maxlength' => 255, 'size' => CRM_Utils_Type::HUGE, 'where' => 'civicrm_price_field_value.label', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -278,7 +278,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'rows' => 2, 'cols' => 60, 'where' => 'civicrm_price_field_value.description', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -297,7 +297,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'rows' => 2, 'cols' => 60, 'where' => 'civicrm_price_field_value.help_pre', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -316,7 +316,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'rows' => 2, 'cols' => 60, 'where' => 'civicrm_price_field_value.help_post', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -353,7 +353,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'title' => ts('Count'), 'description' => ts('Number of participants per field option'), 'where' => 'civicrm_price_field_value.count', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -370,7 +370,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'title' => ts('Max Value'), 'description' => ts('Max number of participants per field options'), 'where' => 'civicrm_price_field_value.max_value', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -403,7 +403,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'title' => ts('Membership Type ID'), 'description' => ts('FK to Membership Type'), 'where' => 'civicrm_price_field_value.membership_type_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -421,7 +421,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'title' => ts('Membership Num Terms'), 'description' => ts('Number of terms for this membership'), 'where' => 'civicrm_price_field_value.membership_num_terms', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', @@ -467,7 +467,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO { 'title' => ts('Financial Type ID'), 'description' => ts('FK to Financial Type.'), 'where' => 'civicrm_price_field_value.financial_type_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_field_value', 'entity' => 'PriceFieldValue', 'bao' => 'CRM_Price_BAO_PriceFieldValue', diff --git a/CRM/Price/DAO/PriceSet.php b/CRM/Price/DAO/PriceSet.php index dfdb9cbc03..3204d42e92 100644 --- a/CRM/Price/DAO/PriceSet.php +++ b/CRM/Price/DAO/PriceSet.php @@ -337,7 +337,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO { 'title' => ts('Financial Type ID'), 'description' => ts('FK to Financial Type(for membership price sets only).'), 'where' => 'civicrm_price_set.financial_type_id', - 'default' => 'NULL', + 'default' => NULL, 'table_name' => 'civicrm_price_set', 'entity' => 'PriceSet', 'bao' => 'CRM_Price_BAO_PriceSet', diff --git a/xml/templates/dao.tpl b/xml/templates/dao.tpl index f80ab793ac..06c0164e89 100644 --- a/xml/templates/dao.tpl +++ b/xml/templates/dao.tpl @@ -198,7 +198,8 @@ class {$table.className} extends CRM_Core_DAO {ldelim} 'permission' => {$field.permission|@print_array}, {/if} {if $field.default || $field.default === '0'} - 'default' => '{if ($field.default[0]=="'" or $field.default[0]=='"')}{$field.default|substring:1:-1}{else}{$field.default}{/if}', + {capture assign=unquotedDefault}{if ($field.default[0]=="'" or $field.default[0]=='"')}{$field.default|substring:1:-1}{else}{$field.default}{/if}{/capture} + 'default' => {if ($unquotedDefault==='NULL')}NULL{else}'{$unquotedDefault}'{/if}, {/if} {* field.default *} 'table_name' => '{$table.name}', 'entity' => '{$table.entity}', -- 2.25.1