CRM-9683 regenerate DAOs

civicrm · Apr 13, 2017 · 2759260 · 2759260
1 parent 1ccde47
commit 2759260
Show file tree

Hide file tree

Showing 16 changed files with 98 additions and 58 deletions.
diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php
@@ -24,7 +24,7 @@
 | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
 +--------------------------------------------------------------------+
 */
-// (GenCodeChecksum:de6dc96f4442bc90970f8e8c26b1c802)
+// (GenCodeChecksum:6fb21dc5fcac8590c2ab3dc8b140e034)
 return array(
   'CRM_Core_DAO_AddressFormat' => array(
     'name' => 'AddressFormat',

diff --git a/CRM/Core/DAO/Cache.php b/CRM/Core/DAO/Cache.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Cache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f7e211585872f6ee2e8492ea79bbb22a)
+ * (GenCodeChecksum:7e57800355db0e3aa11c15d6c73bf9a2)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
@@ -82,13 +82,13 @@ class CRM_Core_DAO_Cache extends CRM_Core_DAO {
   /**
    * When was the cache item created
    *
-   * @var datetime
+   * @var timestamp
    */
   public $created_date;
   /**
    * When should the cache item expire
    *
-   * @var datetime
+   * @var timestamp
    */
   public $expired_date;
   /**
@@ -184,19 +184,22 @@ static function &fields() {
         ) ,
         'created_date' => array(
           'name' => 'created_date',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Created Date') ,
           'description' => 'When was the cache item created',
+          'default' => 'CURRENT_TIMESTAMP',
           'table_name' => 'civicrm_cache',
           'entity' => 'Cache',
           'bao' => 'CRM_Core_BAO_Cache',
           'localizable' => 0,
         ) ,
         'expired_date' => array(
           'name' => 'expired_date',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Expired Date') ,
           'description' => 'When should the cache item expire',
+          'required' => false,
+          'default' => 'NULL',
           'table_name' => 'civicrm_cache',
           'entity' => 'Cache',
           'bao' => 'CRM_Core_BAO_Cache',

diff --git a/CRM/Core/DAO/Job.php b/CRM/Core/DAO/Job.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Core/Job.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c3340527b2d2cb17211eba848371b469)
+ * (GenCodeChecksum:ec2775b0ba09eb61d32f1565ebbaf4f8)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
@@ -71,7 +71,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO {
   /**
    * When was this cron entry last run
    *
-   * @var datetime
+   * @var timestamp
    */
   public $last_run;
   /**
@@ -194,9 +194,10 @@ static function &fields() {
         ) ,
         'last_run' => array(
           'name' => 'last_run',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Last Run') ,
           'description' => 'When was this cron entry last run',
+          'required' => false,
           'default' => 'NULL',
           'table_name' => 'civicrm_job',
           'entity' => 'Job',

diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Mailing.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:22b978860c196afa0de69fab862907e8)
+ * (GenCodeChecksum:9a7cf33adcdee2e83d5fe1b5a28186cb)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
@@ -207,7 +207,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   /**
    * Date and time this mailing was created.
    *
-   * @var datetime
+   * @var timestamp
    */
   public $created_date;
   /**
@@ -219,7 +219,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   /**
    * Date and time this mailing was scheduled.
    *
-   * @var datetime
+   * @var timestamp
    */
   public $scheduled_date;
   /**
@@ -231,7 +231,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   /**
    * Date and time this mailing was approved.
    *
-   * @var datetime
+   * @var timestamp
    */
   public $approval_date;
   /**
@@ -669,15 +669,18 @@ static function &fields() {
         ) ,
         'created_date' => array(
           'name' => 'created_date',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Mailing Created Date') ,
           'description' => 'Date and time this mailing was created.',
+          'required' => false,
+          'default' => 'CURRENT_TIMESTAMP',
           'table_name' => 'civicrm_mailing',
           'entity' => 'Mailing',
           'bao' => 'CRM_Mailing_BAO_Mailing',
           'localizable' => 0,
           'html' => array(
             'type' => 'Select Date',
+            'formatType' => 'activityDateTime',
           ) ,
         ) ,
         'scheduled_id' => array(
@@ -693,13 +696,19 @@ static function &fields() {
         ) ,
         'scheduled_date' => array(
           'name' => 'scheduled_date',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Mailing Scheduled Date') ,
           'description' => 'Date and time this mailing was scheduled.',
+          'required' => false,
+          'default' => 'NULL',
           'table_name' => 'civicrm_mailing',
           'entity' => 'Mailing',
           'bao' => 'CRM_Mailing_BAO_Mailing',
           'localizable' => 0,
+          'html' => array(
+            'type' => 'Select Date',
+            'formatType' => 'activityDateTime',
+          ) ,
         ) ,
         'approver_id' => array(
           'name' => 'approver_id',
@@ -714,13 +723,19 @@ static function &fields() {
         ) ,
         'approval_date' => array(
           'name' => 'approval_date',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Mailing Approved Date') ,
           'description' => 'Date and time this mailing was approved.',
+          'required' => false,
+          'default' => 'NULL',
           'table_name' => 'civicrm_mailing',
           'entity' => 'Mailing',
           'bao' => 'CRM_Mailing_BAO_Mailing',
           'localizable' => 0,
+          'html' => array(
+            'type' => 'Select Date',
+            'formatType' => 'activityDateTime',
+          ) ,
         ) ,
         'approval_status_id' => array(
           'name' => 'approval_status_id',

diff --git a/CRM/Mailing/DAO/MailingAB.php b/CRM/Mailing/DAO/MailingAB.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingAB.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fea3382fd8611956ff04827237800b49)
+ * (GenCodeChecksum:12d9514d27712e3d9ad545ca6c2bfe91)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
@@ -127,7 +127,7 @@ class CRM_Mailing_DAO_MailingAB extends CRM_Core_DAO {
   /**
    * When was this item created
    *
-   * @var datetime
+   * @var timestamp
    */
   public $created_date;
   /**
@@ -308,9 +308,11 @@ static function &fields() {
         ) ,
         'created_date' => array(
           'name' => 'created_date',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('AB Test Created Date') ,
           'description' => 'When was this item created',
+          'required' => false,
+          'default' => 'CURRENT_TIMESTAMP',
           'table_name' => 'civicrm_mailing_abtest',
           'entity' => 'MailingAB',
           'bao' => 'CRM_Mailing_BAO_MailingAB',

diff --git a/CRM/Mailing/DAO/MailingJob.php b/CRM/Mailing/DAO/MailingJob.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingJob.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c08c4d0fc52564ca707e07af4649231c)
+ * (GenCodeChecksum:51449e1b36d9d248712f346f20c9e446)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
@@ -64,19 +64,19 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO {
   /**
    * date on which this job was scheduled.
    *
-   * @var datetime
+   * @var timestamp
    */
   public $scheduled_date;
   /**
    * date on which this job was started.
    *
-   * @var datetime
+   * @var timestamp
    */
   public $start_date;
   /**
    * date on which this job ended.
    *
-   * @var datetime
+   * @var timestamp
    */
   public $end_date;
   /**
@@ -169,29 +169,35 @@ static function &fields() {
         ) ,
         'scheduled_date' => array(
           'name' => 'scheduled_date',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Mailing Scheduled Date') ,
           'description' => 'date on which this job was scheduled.',
+          'required' => false,
+          'default' => 'NULL',
           'table_name' => 'civicrm_mailing_job',
           'entity' => 'MailingJob',
           'bao' => 'CRM_Mailing_BAO_MailingJob',
           'localizable' => 0,
         ) ,
         'start_date' => array(
           'name' => 'start_date',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Mailing Job Start Date') ,
           'description' => 'date on which this job was started.',
+          'required' => false,
+          'default' => 'NULL',
           'table_name' => 'civicrm_mailing_job',
           'entity' => 'MailingJob',
           'bao' => 'CRM_Mailing_BAO_MailingJob',
           'localizable' => 0,
         ) ,
         'end_date' => array(
           'name' => 'end_date',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Mailing Job End Date') ,
           'description' => 'date on which this job ended.',
+          'required' => false,
+          'default' => 'NULL',
           'table_name' => 'civicrm_mailing_job',
           'entity' => 'MailingJob',
           'bao' => 'CRM_Mailing_BAO_MailingJob',

diff --git a/CRM/Mailing/DAO/Spool.php b/CRM/Mailing/DAO/Spool.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Spool.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1062bf7f253de6cdb25f4a434249b050)
+ * (GenCodeChecksum:8cdc46330195fed32b15c2560dee858d)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
@@ -82,13 +82,13 @@ class CRM_Mailing_DAO_Spool extends CRM_Core_DAO {
   /**
    * date on which this job was added.
    *
-   * @var datetime
+   * @var timestamp
    */
   public $added_at;
   /**
    * date on which this job was removed.
    *
-   * @var datetime
+   * @var timestamp
    */
   public $removed_at;
   /**
@@ -174,19 +174,23 @@ static function &fields() {
         ) ,
         'added_at' => array(
           'name' => 'added_at',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Added') ,
           'description' => 'date on which this job was added.',
+          'required' => false,
+          'default' => 'NULL',
           'table_name' => 'civicrm_mailing_spool',
           'entity' => 'Spool',
           'bao' => 'CRM_Mailing_BAO_Spool',
           'localizable' => 0,
         ) ,
         'removed_at' => array(
           'name' => 'removed_at',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Removed') ,
           'description' => 'date on which this job was removed.',
+          'required' => false,
+          'default' => 'NULL',
           'table_name' => 'civicrm_mailing_spool',
           'entity' => 'Spool',
           'bao' => 'CRM_Mailing_BAO_Spool',

diff --git a/CRM/Mailing/Event/DAO/Bounce.php b/CRM/Mailing/Event/DAO/Bounce.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Bounce.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b3ece7fb5a8c702f3a9c8e4bef1a38ca)
+ * (GenCodeChecksum:c63363ca2be2a2fb9eb090786bdf0fa3)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
@@ -76,7 +76,7 @@ class CRM_Mailing_Event_DAO_Bounce extends CRM_Core_DAO {
   /**
    * When this bounce event occurred.
    *
-   * @var datetime
+   * @var timestamp
    */
   public $time_stamp;
   /**
@@ -162,10 +162,11 @@ static function &fields() {
         ) ,
         'time_stamp' => array(
           'name' => 'time_stamp',
-          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Timestamp') ,
           'description' => 'When this bounce event occurred.',
           'required' => true,
+          'default' => 'CURRENT_TIMESTAMP',
           'table_name' => 'civicrm_mailing_event_bounce',
           'entity' => 'Bounce',
           'bao' => 'CRM_Mailing_Event_BAO_Bounce',