Convert civicrm_note.modified_date to timestamp

civicrm · Feb 10, 2020 · 5377e6c · 5377e6c
1 parent e9ada0a
commit 5377e6c
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 13 deletions.
diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
@@ -533,7 +533,6 @@ public static function create(&$params, $ids = []) {
         'note' => $params['note'],
         'entity_id' => $contribution->id,
         'contact_id' => $session->get('userID'),
-        'modified_date' => date('Ymd'),
       ];
       if (!$noteParams['contact_id']) {
         $noteParams['contact_id'] = $params['contact_id'];

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1001,7 +1001,6 @@ public static function processFormContribution(
         'note' => $params['contribution_note'],
         'entity_id' => $contribution->id,
         'contact_id' => $contribution->contact_id,
-        'modified_date' => date('Ymd'),
       ];
 
       CRM_Core_BAO_Note::add($noteParams, []);

diff --git a/CRM/Core/BAO/Note.php b/CRM/Core/BAO/Note.php
@@ -135,10 +135,6 @@ public static function add(&$params, $ids = array()) {
 
     $note = new CRM_Core_BAO_Note();
 
-    if (!isset($params['modified_date'])) {
-      $params['modified_date'] = date("Ymd");
-    }
-
     if (!isset($params['privacy'])) {
       $params['privacy'] = 0;
     }

diff --git a/CRM/Core/DAO/Note.php b/CRM/Core/DAO/Note.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Note.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1a545c1e601969ae689d9577a3c14389)
+ * (GenCodeChecksum:7a58bb39022811ac55bfaed58c241487)
  */
 
 /**
@@ -66,7 +66,7 @@ class CRM_Core_DAO_Note extends CRM_Core_DAO {
   /**
    * When was this note last modified/edited
    *
-   * @var date
+   * @var timestamp
    */
   public $modified_date;
 
@@ -191,10 +191,11 @@ public static function &fields() {
         ],
         'modified_date' => [
           'name' => 'modified_date',
-          'type' => CRM_Utils_Type::T_DATE,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Note Modified By'),
           'description' => ts('When was this note last modified/edited'),
           'where' => 'civicrm_note.modified_date',
+          'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
           'table_name' => 'civicrm_note',
           'entity' => 'Note',
           'bao' => 'CRM_Core_BAO_Note',

diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php
@@ -238,7 +238,6 @@ public static function create(&$params) {
           'note' => $noteValue,
           'entity_id' => $participant->id,
           'contact_id' => $id,
-          'modified_date' => date('Ymd'),
         ];
         $noteIDs = [];
         if ($noteId) {

diff --git a/CRM/Event/Form/ParticipantFeeSelection.php b/CRM/Event/Form/ParticipantFeeSelection.php
@@ -252,7 +252,6 @@ public function postProcess() {
         'note' => $params['note'],
         'entity_id' => $this->_participantId,
         'contact_id' => $this->_contactId,
-        'modified_date' => date('Ymd'),
       ];
       CRM_Core_BAO_Note::add($noteParams);
     }

diff --git a/CRM/Grant/BAO/Grant.php b/CRM/Grant/BAO/Grant.php
@@ -241,7 +241,6 @@ public static function create(&$params, &$ids) {
         'note' => $params['note'] = $params['note'] ? $params['note'] : "null",
         'entity_id' => $grant->id,
         'contact_id' => $id,
-        'modified_date' => date('Ymd'),
       ];
 
       CRM_Core_BAO_Note::add($noteParams, (array) CRM_Utils_Array::value('note', $ids));

diff --git a/CRM/Upgrade/Incremental/sql/5.24.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.24.alpha1.mysql.tpl
@@ -1 +1,4 @@
 {* file to handle db changes in 5.24.alpha1 during upgrade *}
+
+{* #16338 Convert civicrm_note.modified_date to timestamp *}
+ALTER TABLE civicrm_note MODIFY COLUMN modified_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When was this note last modified/edited';
diff --git a/xml/schema/Core/Note.xml b/xml/schema/Core/Note.xml
@@ -82,8 +82,9 @@
   <field>
     <name>modified_date</name>
     <title>Note Modified By</title>
-    <type>date</type>
+    <type>timestamp</type>
     <comment>When was this note last modified/edited</comment>
+    <default>CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP</default>
     <add>1.1</add>
   </field>
   <field>