From 219761e82630f298fae6cbf473dd2dd4de734ec6 Mon Sep 17 00:00:00 2001
From: Monish Deb <monish.deb@jmaconsulting.biz>
Date: Thu, 7 Apr 2022 18:12:15 -0700
Subject: [PATCH] Schema - Fix boolean fields in 'Activity'

---
 CRM/Activity/DAO/Activity.php                   | 17 +++++++++++------
 .../php/FiveFortyNine/Activity.bool.php         | 10 ++++++++++
 xml/schema/Activity/Activity.xml                |  5 +++++
 3 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 CRM/Upgrade/Incremental/php/FiveFortyNine/Activity.bool.php

diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php
index 516386a36f..4be0a386ce 100644
--- a/CRM/Activity/DAO/Activity.php
+++ b/CRM/Activity/DAO/Activity.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Activity/Activity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b37cf83d01ce6a8f72be6de97f00d7d3)
+ * (GenCodeChecksum:84bf6ac4a394e07666a4b2fb1456a794)
  */
 
 /**
@@ -174,7 +174,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   public $parent_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -190,7 +190,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   public $medium_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -206,7 +206,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   public $relationship_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -231,7 +231,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   public $result;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -265,7 +265,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   /**
    * Activity marked as favorite.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -595,6 +595,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
           'name' => 'is_test',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Test'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_activity.is_test',
           'headerPattern' => '/(is.)?test(.activity)?/i',
@@ -633,6 +634,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
           'name' => 'is_auto',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Auto'),
+          'required' => TRUE,
           'where' => 'civicrm_activity.is_auto',
           'default' => '0',
           'table_name' => 'civicrm_activity',
@@ -662,6 +664,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
           'name' => 'is_current_revision',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is this activity a current revision in versioning chain?'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_activity.is_current_revision',
           'headerPattern' => '/(is.)?(current.)?(revision|version(ing)?)/i',
@@ -708,6 +711,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
           'name' => 'is_deleted',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Activity is in the Trash'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_activity.is_deleted',
           'headerPattern' => '/(activity.)?(trash|deleted)/i',
@@ -785,6 +789,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Starred'),
           'description' => ts('Activity marked as favorite.'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_activity.is_star',
           'headerPattern' => '/(activity.)?(star|favorite)/i',
diff --git a/CRM/Upgrade/Incremental/php/FiveFortyNine/Activity.bool.php b/CRM/Upgrade/Incremental/php/FiveFortyNine/Activity.bool.php
new file mode 100644
index 0000000000..40dcb96fad
--- /dev/null
+++ b/CRM/Upgrade/Incremental/php/FiveFortyNine/Activity.bool.php
@@ -0,0 +1,10 @@
+<?php
+return [
+  'civicrm_activity' => [
+    'is_test' => "DEFAULT 0",
+    'is_auto' => "DEFAULT 0",
+    'is_current_revision' => "DEFAULT 1",
+    'is_deleted' => "DEFAULT 0",
+    'is_star' => "DEFAULT 0 COMMENT 'Activity marked as favorite.'",
+  ],
+];
diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml
index 7a36114119..cf4fce76fb 100644
--- a/xml/schema/Activity/Activity.xml
+++ b/xml/schema/Activity/Activity.xml
@@ -237,6 +237,7 @@
     <uniqueName>activity_is_test</uniqueName>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <headerPattern>/(is.)?test(.activity)?/i</headerPattern>
     <add>2.0</add>
@@ -270,6 +271,7 @@
     <title>Auto</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <add>2.2</add>
   </field>
   <field>
@@ -294,6 +296,7 @@
     <title>Is this activity a current revision in versioning chain?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <import>true</import>
     <headerPattern>/(is.)?(current.)?(revision|version(ing)?)/i</headerPattern>
     <add>2.2</add>
@@ -336,6 +339,7 @@
     <title>Activity is in the Trash</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <headerPattern>/(activity.)?(trash|deleted)/i</headerPattern>
     <add>2.2</add>
@@ -400,6 +404,7 @@
     <title>Is Starred</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <comment>Activity marked as favorite.</comment>
     <headerPattern>/(activity.)?(star|favorite)/i</headerPattern>
-- 
2.25.1