projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e43dfd1)
QueueItem - Mark submit_time and release_time as TIMESTAMP
authorTim Otten <totten@civicrm.org>
Sat, 27 Aug 2022 00:40:01 +0000 (17:40 -0700)
committerTim Otten <totten@civicrm.org>
Sun, 28 Aug 2022 22:09:16 +0000 (15:09 -0700)
CRM/Queue/DAO/QueueItem.php patch | blob | blame | history
xml/schema/Queue/QueueItem.xml patch | blob | blame | history

diff --git a/CRM/Queue/DAO/QueueItem.php b/CRM/Queue/DAO/QueueItem.php
index 523c5ff58c5a28e9b00b413c011c149eb1d854e8..18c9f53215850a8dcad293299e8eb928370ae7bd 100644 (file)
--- 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 782421f15a13f1f8b81ff034f342b7d8fc521343..a195e3f0b0132b619f7fd28679ba36a3998495cc 100644 (file)
--- a/xml/schema/Queue/QueueItem.xml
+++ b/xml/schema/Queue/QueueItem.xml
@@ -46,7 +46,7 @@
   <field>
     <name>submit_time</name>
     <title>Submit Time</title>
-    <type>datetime</type>
+    <type>timestamp</type>
     <comment>date on which this item was submitted to the queue</comment>
     <required>true</required>
     <html>
@@ -57,7 +57,9 @@
   <field>
     <name>release_time</name>
     <title>Release Time</title>
-    <type>datetime</type>
+    <type>timestamp</type>
+    <required>false</required>
+    <default>NULL</default>
     <comment>date on which this job becomes available; null if ASAP</comment>
     <html>
       <type>Select Date</type>