From 64d64b190278a1ea75eab83b9cb5cbb8ecb6d9f3 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 10 Mar 2022 11:26:47 -0500
Subject: [PATCH] Schema - Fix boolean fields in civicrm_event and
 civicrm_contribution tables

This fixes 2 tables to ensure boolean fields always have a default value and are always NOT NULL.
---
 CRM/Contribute/DAO/Contribution.php           | 11 ++--
 CRM/Core/BAO/CustomGroup.php                  |  2 +-
 CRM/Event/DAO/Event.php                       | 55 +++++++++++++------
 .../Incremental/sql/5.49.alpha1.mysql.tpl     | 47 ++++++++++++++++
 xml/schema/Contribute/Contribution.xml        |  3 +
 xml/schema/Event/Event.xml                    | 20 +++++++
 6 files changed, 115 insertions(+), 23 deletions(-)

diff --git a/CRM/Contribute/DAO/Contribution.php b/CRM/Contribute/DAO/Contribution.php
index a53aeea42a..01911b8f04 100644
--- a/CRM/Contribute/DAO/Contribution.php
+++ b/CRM/Contribute/DAO/Contribution.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Contribution.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:204947e70942c2db4fb9b84398818aa1)
+ * (GenCodeChecksum:edd96be2e997a659ceeee0cf823c6f90)
  */
 
 /**
@@ -236,14 +236,14 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO {
   public $contribution_recur_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $is_test;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -311,7 +311,7 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO {
   /**
    * Shows this is a template for recurring contributions.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -827,6 +827,7 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO {
           'name' => 'is_test',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Test'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_contribution.is_test',
           'export' => TRUE,
@@ -844,6 +845,7 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO {
           'name' => 'is_pay_later',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Pay Later'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_contribution.is_pay_later',
           'export' => TRUE,
@@ -1011,6 +1013,7 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is a Template Contribution'),
           'description' => ts('Shows this is a template for recurring contributions.'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_contribution.is_template',
           'export' => TRUE,
diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
index 6ff92d35b0..0988048481 100644
--- a/CRM/Core/BAO/CustomGroup.php
+++ b/CRM/Core/BAO/CustomGroup.php
@@ -2259,7 +2259,7 @@ SELECT  civicrm_custom_group.id as groupID, civicrm_custom_group.title as groupT
     $sel2['Campaign'] = $campaignTypes;
     $sel2['Membership'] = $membershipType;
     $sel2['ParticipantRole'] = $participantRole;
-    $sel2['ParticipantEventName'] = CRM_Event_PseudoConstant::event(NULL, FALSE, "( is_template IS NULL OR is_template != 1 )");
+    $sel2['ParticipantEventName'] = CRM_Event_PseudoConstant::event(NULL, FALSE, "( is_template != 1 )");
     $sel2['ParticipantEventType'] = $eventType;
     $sel2['Contribution'] = CRM_Contribute_PseudoConstant::financialType();
     $sel2['Relationship'] = CRM_Custom_Form_Group::getRelationshipTypes();
diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php
index afc84033dc..3a93606064 100644
--- a/CRM/Event/DAO/Event.php
+++ b/CRM/Event/DAO/Event.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Event.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d9ea1f641de04dabb54616ef4edfe88c)
+ * (GenCodeChecksum:6a26fb9bb9dfd05cdbecc91904f4b1d4)
  */
 
 /**
@@ -112,7 +112,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * Public events will be included in the iCal feeds. Access to private event information may be limited using ACLs.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -139,7 +139,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * If true, include registration link on Event Info page.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -193,7 +193,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * If true, one or more fee amounts must be set and a Payment Processor must be configured for Online Event Registration.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -220,7 +220,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * Include a map block on the Event Information page when geocode info is available and a mapping provider has been specified?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -229,7 +229,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * Is this Event enabled or disabled/cancelled?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -245,7 +245,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * If true, show event location.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -317,7 +317,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * If true, confirmation is automatically emailed to contact on successful registration.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -416,7 +416,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * if true - allows the user to send payment directly to the org later
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -443,7 +443,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * is partial payment enabled for this event
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -479,7 +479,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * if true - allows the user to register multiple participants for event
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -497,7 +497,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * if true - allows the user to register multiple registrations from same email address.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -506,7 +506,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * Whether the event has waitlist support.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -515,7 +515,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * Whether participants require approval before they can finish registering.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -533,7 +533,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * Allow self service cancellation or transfer for event?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -623,7 +623,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * Can people share the event through social media?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -632,7 +632,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * If false, the event booking confirmation screen gets skipped
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -668,7 +668,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * if true than billing block is required this event
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -852,6 +852,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Event Public'),
           'description' => ts('Public events will be included in the iCal feeds. Access to private event information may be limited using ACLs.'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_public',
           'default' => '1',
           'table_name' => 'civicrm_event',
@@ -910,6 +911,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Online Registration'),
           'description' => ts('If true, include registration link on Event Info page.'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_online_registration',
           'default' => '0',
           'table_name' => 'civicrm_event',
@@ -1014,6 +1016,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is this a PAID event?'),
           'description' => ts('If true, one or more fee amounts must be set and a Payment Processor must be configured for Online Event Registration.'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_monetary',
           'default' => '0',
           'table_name' => 'civicrm_event',
@@ -1075,6 +1078,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Map Enabled'),
           'description' => ts('Include a map block on the Event Information page when geocode info is available and a mapping provider has been specified?'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_map',
           'default' => '0',
           'table_name' => 'civicrm_event',
@@ -1091,6 +1095,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Active'),
           'description' => ts('Is this Event enabled or disabled/cancelled?'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_active',
           'default' => '0',
           'table_name' => 'civicrm_event',
@@ -1126,6 +1131,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('show location'),
           'description' => ts('If true, show event location.'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_show_location',
           'default' => '1',
           'table_name' => 'civicrm_event',
@@ -1266,6 +1272,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is confirm email'),
           'description' => ts('If true, confirmation is automatically emailed to contact on successful registration.'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_email_confirm',
           'default' => '0',
           'table_name' => 'civicrm_event',
@@ -1445,6 +1452,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Pay Later Allowed'),
           'description' => ts('if true - allows the user to send payment directly to the org later'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_pay_later',
           'default' => '0',
           'table_name' => 'civicrm_event',
@@ -1491,6 +1499,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Partial Payments Enabled'),
           'description' => ts('is partial payment enabled for this event'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_partial_payment',
           'default' => '0',
           'table_name' => 'civicrm_event',
@@ -1558,6 +1567,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Allow Multiple Registrations'),
           'description' => ts('if true - allows the user to register multiple participants for event'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_multiple_registrations',
           'default' => '0',
           'table_name' => 'civicrm_event',
@@ -1587,6 +1597,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Does Event allow multiple registrations from same email address?'),
           'description' => ts('if true - allows the user to register multiple registrations from same email address.'),
+          'required' => TRUE,
           'where' => 'civicrm_event.allow_same_participant_emails',
           'default' => '0',
           'table_name' => 'civicrm_event',
@@ -1603,7 +1614,9 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Waitlist Enabled'),
           'description' => ts('Whether the event has waitlist support.'),
+          'required' => TRUE,
           'where' => 'civicrm_event.has_waitlist',
+          'default' => '0',
           'table_name' => 'civicrm_event',
           'entity' => 'Event',
           'bao' => 'CRM_Event_BAO_Event',
@@ -1618,7 +1631,9 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Requires Approval'),
           'description' => ts('Whether participants require approval before they can finish registering.'),
+          'required' => TRUE,
           'where' => 'civicrm_event.requires_approval',
+          'default' => '0',
           'table_name' => 'civicrm_event',
           'entity' => 'Event',
           'bao' => 'CRM_Event_BAO_Event',
@@ -1650,6 +1665,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Allow Self-service Cancellation or Transfer'),
           'description' => ts('Allow self service cancellation or transfer for event?'),
+          'required' => TRUE,
           'where' => 'civicrm_event.allow_selfcancelxfer',
           'default' => '0',
           'table_name' => 'civicrm_event',
@@ -1836,6 +1852,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is shared through social media'),
           'description' => ts('Can people share the event through social media?'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_share',
           'default' => '1',
           'table_name' => 'civicrm_event',
@@ -1852,6 +1869,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is the booking confirmation screen enabled?'),
           'description' => ts('If false, the event booking confirmation screen gets skipped'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_confirm_enabled',
           'default' => '1',
           'table_name' => 'civicrm_event',
@@ -1924,6 +1942,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is billing block required'),
           'description' => ts('if true than billing block is required this event'),
+          'required' => TRUE,
           'where' => 'civicrm_event.is_billing_required',
           'default' => '0',
           'table_name' => 'civicrm_event',
diff --git a/CRM/Upgrade/Incremental/sql/5.49.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.49.alpha1.mysql.tpl
index ea81d7b768..c63b0b2e6d 100644
--- a/CRM/Upgrade/Incremental/sql/5.49.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/5.49.alpha1.mysql.tpl
@@ -1 +1,48 @@
 {* file to handle db changes in 5.49.alpha1 during upgrade *}
+
+UPDATE `civicrm_event` SET is_public = 0 WHERE is_public IS NULL;
+UPDATE `civicrm_event` SET is_online_registration = 0 WHERE is_online_registration IS NULL;
+UPDATE `civicrm_event` SET is_monetary = 0 WHERE is_monetary IS NULL;
+UPDATE `civicrm_event` SET is_map = 0 WHERE is_map IS NULL;
+UPDATE `civicrm_event` SET is_active = 0 WHERE is_active IS NULL;
+UPDATE `civicrm_event` SET is_show_location = 0 WHERE is_show_location IS NULL;
+UPDATE `civicrm_event` SET is_email_confirm = 0 WHERE is_email_confirm IS NULL;
+UPDATE `civicrm_event` SET is_pay_later = 0 WHERE is_pay_later IS NULL;
+UPDATE `civicrm_event` SET is_partial_payment = 0 WHERE is_partial_payment IS NULL;
+UPDATE `civicrm_event` SET is_multiple_registrations = 0 WHERE is_multiple_registrations IS NULL;
+UPDATE `civicrm_event` SET allow_same_participant_emails = 0 WHERE allow_same_participant_emails IS NULL;
+UPDATE `civicrm_event` SET has_waitlist = 0 WHERE has_waitlist IS NULL;
+UPDATE `civicrm_event` SET requires_approval = 0 WHERE requires_approval IS NULL;
+UPDATE `civicrm_event` SET allow_selfcancelxfer = 0 WHERE allow_selfcancelxfer IS NULL;
+UPDATE `civicrm_event` SET is_template = 0 WHERE is_template IS NULL;
+UPDATE `civicrm_event` SET is_share = 0 WHERE is_share IS NULL;
+UPDATE `civicrm_event` SET is_confirm_enabled = 0 WHERE is_confirm_enabled IS NULL;
+UPDATE `civicrm_event` SET is_billing_required = 0 WHERE is_billing_required IS NULL;
+ALTER TABLE `civicrm_event`
+  CHANGE `is_public` `is_public` tinyint NOT NULL DEFAULT 1 COMMENT 'Public events will be included in the iCal feeds. Access to private event information may be limited using ACLs.',
+  CHANGE `is_online_registration` `is_online_registration` tinyint NOT NULL DEFAULT 0 COMMENT 'If true, include registration link on Event Info page.',
+  CHANGE `is_monetary` `is_monetary` tinyint NOT NULL DEFAULT 0 COMMENT 'If true, one or more fee amounts must be set and a Payment Processor must be configured for Online Event Registration.',
+  CHANGE `is_map` `is_map` tinyint NOT NULL DEFAULT 0 COMMENT 'Include a map block on the Event Information page when geocode info is available and a mapping provider has been specified?',
+  CHANGE `is_active` `is_active` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this Event enabled or disabled/cancelled?',
+  CHANGE `is_show_location` `is_show_location` tinyint NOT NULL DEFAULT 1 COMMENT 'If true, show event location.',
+  CHANGE `is_email_confirm` `is_email_confirm` tinyint NOT NULL DEFAULT 0 COMMENT 'If true, confirmation is automatically emailed to contact on successful registration.',
+  CHANGE `is_pay_later` `is_pay_later` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - allows the user to send payment directly to the org later',
+  CHANGE `is_partial_payment` `is_partial_payment` tinyint NOT NULL DEFAULT 0 COMMENT 'is partial payment enabled for this event',
+  CHANGE `is_multiple_registrations` `is_multiple_registrations` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - allows the user to register multiple participants for event',
+  CHANGE `allow_same_participant_emails` `allow_same_participant_emails` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - allows the user to register multiple registrations from same email address.',
+  CHANGE `has_waitlist` `has_waitlist` tinyint NOT NULL DEFAULT 0 COMMENT 'Whether the event has waitlist support.',
+  CHANGE `requires_approval` `requires_approval` tinyint NOT NULL DEFAULT 0 COMMENT 'Whether participants require approval before they can finish registering.',
+  CHANGE `allow_selfcancelxfer` `allow_selfcancelxfer` tinyint NOT NULL DEFAULT 0 COMMENT 'Allow self service cancellation or transfer for event?',
+  CHANGE `is_template` `is_template` tinyint NOT NULL DEFAULT 0 COMMENT 'whether the event has template',
+  CHANGE `is_share` `is_share` tinyint NOT NULL DEFAULT 1 COMMENT 'Can people share the event through social media?',
+  CHANGE `is_confirm_enabled` `is_confirm_enabled` tinyint NOT NULL DEFAULT 1 COMMENT 'If false, the event booking confirmation screen gets skipped',
+  CHANGE `is_billing_required` `is_billing_required` tinyint NOT NULL DEFAULT 0 COMMENT 'if true than billing block is required this event';
+
+UPDATE `civicrm_contribution` SET is_template = 0 WHERE is_template IS NULL;
+UPDATE `civicrm_contribution` SET is_test = 0 WHERE is_test IS NULL;
+UPDATE `civicrm_contribution` SET is_pay_later = 0 WHERE is_pay_later IS NULL;
+ALTER TABLE `civicrm_contribution`
+  CHANGE `is_test` `is_test` tinyint NOT NULL DEFAULT 0,
+  CHANGE `is_pay_later` `is_pay_later` tinyint NOT NULL DEFAULT 0,
+  CHANGE `is_template` `is_template` tinyint NOT NULL DEFAULT 0 COMMENT 'Shows this is a template for recurring contributions.';
+
diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml
index 8fde13a20f..6aa5bc4e9a 100644
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@ -381,6 +381,7 @@
     <title>Test</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <html>
       <type>CheckBox</type>
@@ -391,6 +392,7 @@
     <title>Is Pay Later</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <add>2.1</add>
     <html>
@@ -538,6 +540,7 @@
     <title>Is a Template Contribution</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <comment>Shows this is a template for recurring contributions.</comment>
     <readonly>true</readonly>
diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml
index 067a3a528c..1dcc7615b2 100644
--- a/xml/schema/Event/Event.xml
+++ b/xml/schema/Event/Event.xml
@@ -114,6 +114,7 @@
   <field>
     <name>is_public</name>
     <type>boolean</type>
+    <required>true</required>
     <title>Is Event Public</title>
     <default>1</default>
     <comment>Public events will be included in the iCal feeds. Access to private event information may be limited using ACLs.</comment>
@@ -157,6 +158,7 @@
   <field>
     <name>is_online_registration</name>
     <type>boolean</type>
+    <required>true</required>
     <title>Is Online Registration</title>
     <default>0</default>
     <comment>If true, include registration link on Event Info page.</comment>
@@ -231,6 +233,7 @@
     <name>is_monetary</name>
     <title>Is this a PAID event?</title>
     <type>boolean</type>
+    <required>true</required>
     <default>0</default>
     <comment>If true, one or more fee amounts must be set and a Payment Processor must be configured for Online Event Registration.</comment>
     <add>1.7</add>
@@ -275,6 +278,7 @@
     <name>is_map</name>
     <title>Map Enabled</title>
     <type>boolean</type>
+    <required>true</required>
     <default>0</default>
     <comment>Include a map block on the Event Information page when geocode info is available and a mapping provider has been specified?</comment>
     <add>1.7</add>
@@ -286,6 +290,7 @@
     <name>is_active</name>
     <title>Is Active</title>
     <type>boolean</type>
+    <required>true</required>
     <default>0</default>
     <comment>Is this Event enabled or disabled/cancelled?</comment>
     <add>1.7</add>
@@ -309,6 +314,7 @@
   <field>
     <name>is_show_location</name>
     <type>boolean</type>
+    <required>true</required>
     <title>show location</title>
     <default>1</default>
     <comment>If true, show event location.</comment>
@@ -418,6 +424,7 @@
   <field>
     <name>is_email_confirm</name>
     <type>boolean</type>
+    <required>true</required>
     <title>Is confirm email</title>
     <default>0</default>
     <comment>If true, confirmation is automatically emailed to contact on successful registration.</comment>
@@ -541,6 +548,7 @@
     <name>is_pay_later</name>
     <title>Pay Later Allowed</title>
     <type>boolean</type>
+    <required>true</required>
     <default>0</default>
     <comment>if true - allows the user to send payment directly to the org later</comment>
     <add>2.0</add>
@@ -574,6 +582,7 @@
     <name>is_partial_payment</name>
     <title>Partial Payments Enabled</title>
     <type>boolean</type>
+    <required>true</required>
     <default>0</default>
     <comment>is partial payment enabled for this event</comment>
     <add>4.3</add>
@@ -618,6 +627,7 @@
     <name>is_multiple_registrations</name>
     <title>Allow Multiple Registrations</title>
     <type>boolean</type>
+    <required>true</required>
     <default>0</default>
     <comment>if true - allows the user to register multiple participants for event</comment>
     <add>2.1</add>
@@ -636,6 +646,7 @@
   <field>
     <name>allow_same_participant_emails</name>
     <type>boolean</type>
+    <required>true</required>
     <title>Does Event allow multiple registrations from same email address?</title>
     <default>0</default>
     <comment>if true - allows the user to register multiple registrations from same email address.</comment>
@@ -648,6 +659,8 @@
     <name>has_waitlist</name>
     <title>Waitlist Enabled</title>
     <type>boolean</type>
+    <required>true</required>
+    <default>0</default>
     <comment>Whether the event has waitlist support.</comment>
     <add>3.0</add>
     <html>
@@ -657,6 +670,8 @@
   <field>
     <name>requires_approval</name>
     <type>boolean</type>
+    <required>true</required>
+    <default>0</default>
     <comment>Whether participants require approval before they can finish registering.</comment>
     <add>3.0</add>
     <html>
@@ -677,6 +692,7 @@
   <field>
     <name>allow_selfcancelxfer</name>
     <type>boolean</type>
+    <required>true</required>
     <default>0</default>
     <title>Allow Self-service Cancellation or Transfer</title>
     <comment>Allow self service cancellation or transfer for event?</comment>
@@ -726,6 +742,7 @@
     <name>is_template</name>
     <title>Is an Event Template</title>
     <type>boolean</type>
+    <required>true</required>
     <default>0</default>
     <required>true</required>
     <comment>whether the event has template</comment>
@@ -822,6 +839,7 @@
     <name>is_share</name>
     <title>Is shared through social media</title>
     <type>boolean</type>
+    <required>true</required>
     <default>1</default>
     <comment>Can people share the event through social media?</comment>
     <add>4.1</add>
@@ -833,6 +851,7 @@
     <name>is_confirm_enabled</name>
     <title>Is the booking confirmation screen enabled?</title>
     <type>boolean</type>
+    <required>true</required>
     <default>1</default>
     <comment>If false, the event booking confirmation screen gets skipped</comment>
     <add>4.5</add>
@@ -895,6 +914,7 @@
     <name>is_billing_required</name>
     <title>Is billing block required</title>
     <type>boolean</type>
+    <required>true</required>
     <default>0</default>
     <comment>if true than billing block is required this event</comment>
     <add>4.6</add>
-- 
2.25.1