Merge pull request #17493 from pradpnayak/tinyintFixes

dev/core/-/issues/1794, changed int to tinyint for boolean fields

CRM/Core/DAO/CustomGroup.php

@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1e40fdbcc363c9b5e4c880a6838c7375)
+ * (GenCodeChecksum:9fe326403964113e2dde1631bf583c5e)
  */
 
 /**
@@ -80,7 +80,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
   /**
    * Will this group be in collapsed or expanded mode on initial display ?
    *
-   * @var int
+   * @var bool
    */
   public $collapse_display;
 
@@ -143,7 +143,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
   /**
    * Will this group be in collapsed or expanded mode on advanced search display ?
    *
-   * @var int
+   * @var bool
    */
   public $collapse_adv_display;
 
@@ -313,7 +313,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
         ],
         'collapse_display' => [
           'name' => 'collapse_display',
-          'type' => CRM_Utils_Type::T_INT,
+          'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Collapse Custom Group?'),
           'description' => ts('Will this group be in collapsed or expanded mode on initial display ?'),
           'where' => 'civicrm_custom_group.collapse_display',
@@ -429,7 +429,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
         ],
         'collapse_adv_display' => [
           'name' => 'collapse_adv_display',
-          'type' => CRM_Utils_Type::T_INT,
+          'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Collapse Group Display'),
           'description' => ts('Will this group be in collapsed or expanded mode on advanced search display ?'),
           'where' => 'civicrm_custom_group.collapse_adv_display',

CRM/Upgrade/Incremental/sql/5.27.alpha1.mysql.tpl

@@ -4,3 +4,7 @@ UPDATE civicrm_custom_field SET serialize = 1, html_type = REPLACE(html_type, 'M
 WHERE html_type LIKE 'Multi-%' OR html_type = 'CheckBox';
 
 ALTER TABLE `civicrm_contribution_recur` CHANGE `amount` `amount` DECIMAL( 20,2 ) COMMENT 'Amount to be collected (including any sales tax) by payment processor each recurrence.';
+
+-- dev/core/-/issues/1794
+ALTER TABLE `civicrm_custom_group` CHANGE `collapse_adv_display` `collapse_adv_display` TINYINT(4) UNSIGNED NULL DEFAULT '0' COMMENT 'Will this group be in collapsed or expanded mode on advanced search display ?';
+ALTER TABLE `civicrm_custom_group` CHANGE `collapse_display` `collapse_display` TINYINT(4) UNSIGNED NULL DEFAULT '0' COMMENT 'Will this group be in collapsed or expanded mode on initial display ?';

xml/schema/Core/CustomGroup.xml

@@ -94,7 +94,7 @@
   </field>
   <field>
     <name>collapse_display</name>
-    <type>int unsigned</type>
+    <type>boolean</type>
     <title>Collapse Custom Group?</title>
     <default>0</default>
     <comment>Will this group be in collapsed or expanded mode on initial display ?</comment>
@@ -174,7 +174,7 @@
   </field>
   <field>
     <name>collapse_adv_display</name>
-    <type>int unsigned</type>
+    <type>boolean</type>
     <title>Collapse Group Display</title>
     <default>0</default>
     <comment>Will this group be in collapsed or expanded mode on advanced search display ?</comment>