From 6393cdb8c387696b669e588e48aa0e77571624f4 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 26 Aug 2022 17:40:01 -0700 Subject: [PATCH] QueueItem - Mark submit_time and release_time as TIMESTAMP --- CRM/Queue/DAO/QueueItem.php | 14 ++++++++------ xml/schema/Queue/QueueItem.xml | 6 ++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CRM/Queue/DAO/QueueItem.php b/CRM/Queue/DAO/QueueItem.php index 523c5ff58c..18c9f53215 100644 --- a/CRM/Queue/DAO/QueueItem.php +++ b/CRM/Queue/DAO/QueueItem.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Queue/QueueItem.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:849aadfa48a74353ab6e4ce2b7476805) + * (GenCodeChecksum:66a10bb763c83fb0f98f5510b2e708af) */ /** @@ -57,7 +57,7 @@ class CRM_Queue_DAO_QueueItem extends CRM_Core_DAO { * date on which this item was submitted to the queue * * @var string - * (SQL type: datetime) + * (SQL type: timestamp) * Note that values will be retrieved from the database as a string. */ public $submit_time; @@ -65,8 +65,8 @@ class CRM_Queue_DAO_QueueItem extends CRM_Core_DAO { /** * date on which this job becomes available; null if ASAP * - * @var string|null - * (SQL type: datetime) + * @var string + * (SQL type: timestamp) * Note that values will be retrieved from the database as a string. */ public $release_time; @@ -166,7 +166,7 @@ class CRM_Queue_DAO_QueueItem extends CRM_Core_DAO { ], 'submit_time' => [ 'name' => 'submit_time', - 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, + 'type' => CRM_Utils_Type::T_TIMESTAMP, 'title' => ts('Submit Time'), 'description' => ts('date on which this item was submitted to the queue'), 'required' => TRUE, @@ -183,10 +183,12 @@ class CRM_Queue_DAO_QueueItem extends CRM_Core_DAO { ], 'release_time' => [ 'name' => 'release_time', - 'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME, + 'type' => CRM_Utils_Type::T_TIMESTAMP, 'title' => ts('Release Time'), 'description' => ts('date on which this job becomes available; null if ASAP'), + 'required' => FALSE, 'where' => 'civicrm_queue_item.release_time', + 'default' => NULL, 'table_name' => 'civicrm_queue_item', 'entity' => 'QueueItem', 'bao' => 'CRM_Queue_BAO_QueueItem', diff --git a/xml/schema/Queue/QueueItem.xml b/xml/schema/Queue/QueueItem.xml index 782421f15a..a195e3f0b0 100644 --- a/xml/schema/Queue/QueueItem.xml +++ b/xml/schema/Queue/QueueItem.xml @@ -46,7 +46,7 @@ submit_time Submit Time - datetime + timestamp date on which this item was submitted to the queue true @@ -57,7 +57,9 @@ release_time Release Time - datetime + timestamp + false + NULL date on which this job becomes available; null if ASAP Select Date -- 2.25.1