Fix modManagerLog MySQL > 5.7.8

Add right default value for datatime-type column in modx_manager_log table

Re-up of #15736 with migration

core/model/schema/modx.mysql.schema.xml

@@ -646,7 +646,7 @@
 
     <object class="modManagerLog" table="manager_log" extends="xPDO\Om\xPDOSimpleObject">
         <field key="user" dbtype="int" precision="10" attributes="unsigned" phptype="integer" null="false" default="0" />
-        <field key="occurred" dbtype="datetime" phptype="datetime" null="true" default="NULL" />
+        <field key="occurred" dbtype="datetime" phptype="datetime" null="false" default="CURRENT_TIMESTAMP" />
         <field key="action" dbtype="varchar" precision="100" phptype="string" null="false" default="" />
         <field key="classKey" dbtype="varchar" precision="100" phptype="string" null="false" default="" />
         <field key="item" dbtype="varchar" precision="255" phptype="string" null="false" default="0" />

core/src/Revolution/Registry/Db/mysql/modDbRegisterMessage.php

@@ -13,11 +13,11 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
         'version' => '3.0',
         'table' => 'register_messages',
         'extends' => 'xPDO\\Om\\xPDOObject',
-        'tableMeta' =>
+        'tableMeta' => 
         array (
             'engine' => 'InnoDB',
         ),
-        'fields' =>
+        'fields' => 
         array (
             'topic' => NULL,
             'id' => NULL,
@@ -29,9 +29,9 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
             'payload' => NULL,
             'kill' => 0,
         ),
-        'fieldMeta' =>
+        'fieldMeta' => 
         array (
-            'topic' =>
+            'topic' => 
             array (
                 'dbtype' => 'integer',
                 'precision' => '10',
@@ -40,36 +40,36 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
                 'null' => false,
                 'index' => 'pk',
             ),
-            'id' =>
+            'id' => 
             array (
                 'dbtype' => 'varchar',
                 'precision' => '191',
                 'phptype' => 'string',
                 'null' => false,
                 'index' => 'pk',
             ),
-            'created' =>
+            'created' => 
             array (
                 'dbtype' => 'datetime',
                 'phptype' => 'datetime',
                 'null' => false,
                 'index' => 'index',
             ),
-            'valid' =>
+            'valid' => 
             array (
                 'dbtype' => 'datetime',
                 'phptype' => 'datetime',
                 'null' => false,
                 'index' => 'index',
             ),
-            'accessed' =>
+            'accessed' => 
             array (
                 'dbtype' => 'timestamp',
                 'phptype' => 'timestamp',
                 'attributes' => 'ON UPDATE CURRENT_TIMESTAMP',
                 'index' => 'index',
             ),
-            'accesses' =>
+            'accesses' => 
             array (
                 'dbtype' => 'integer',
                 'precision' => '10',
@@ -79,7 +79,7 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
                 'default' => 0,
                 'index' => 'index',
             ),
-            'expires' =>
+            'expires' => 
             array (
                 'dbtype' => 'integer',
                 'precision' => '20',
@@ -88,13 +88,13 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
                 'default' => 0,
                 'index' => 'index',
             ),
-            'payload' =>
+            'payload' => 
             array (
                 'dbtype' => 'mediumtext',
                 'phptype' => 'string',
                 'null' => false,
             ),
-            'kill' =>
+            'kill' => 
             array (
                 'dbtype' => 'tinyint',
                 'precision' => '1',
@@ -104,103 +104,103 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
                 'default' => 0,
             ),
         ),
-        'indexes' =>
+        'indexes' => 
         array (
-            'PRIMARY' =>
+            'PRIMARY' => 
             array (
                 'alias' => 'PRIMARY',
                 'primary' => true,
                 'unique' => true,
                 'type' => 'BTREE',
-                'columns' =>
+                'columns' => 
                 array (
-                    'topic' =>
+                    'topic' => 
                     array (
                         'length' => '',
                         'collation' => 'A',
                         'null' => false,
                     ),
-                    'id' =>
+                    'id' => 
                     array (
                         'length' => '',
                         'collation' => 'A',
                         'null' => false,
                     ),
                 ),
             ),
-            'created' =>
+            'created' => 
             array (
                 'alias' => 'created',
                 'primary' => false,
                 'unique' => false,
                 'type' => 'BTREE',
-                'columns' =>
+                'columns' => 
                 array (
-                    'created' =>
+                    'created' => 
                     array (
                         'length' => '',
                         'collation' => 'A',
                         'null' => false,
                     ),
                 ),
             ),
-            'valid' =>
+            'valid' => 
             array (
                 'alias' => 'valid',
                 'primary' => false,
                 'unique' => false,
                 'type' => 'BTREE',
-                'columns' =>
+                'columns' => 
                 array (
-                    'valid' =>
+                    'valid' => 
                     array (
                         'length' => '',
                         'collation' => 'A',
                         'null' => false,
                     ),
                 ),
             ),
-            'accessed' =>
+            'accessed' => 
             array (
                 'alias' => 'accessed',
                 'primary' => false,
                 'unique' => false,
                 'type' => 'BTREE',
-                'columns' =>
+                'columns' => 
                 array (
-                    'accessed' =>
+                    'accessed' => 
                     array (
                         'length' => '',
                         'collation' => 'A',
                         'null' => false,
                     ),
                 ),
             ),
-            'accesses' =>
+            'accesses' => 
             array (
                 'alias' => 'accesses',
                 'primary' => false,
                 'unique' => false,
                 'type' => 'BTREE',
-                'columns' =>
+                'columns' => 
                 array (
-                    'accesses' =>
+                    'accesses' => 
                     array (
                         'length' => '',
                         'collation' => 'A',
                         'null' => false,
                     ),
                 ),
             ),
-            'expires' =>
+            'expires' => 
             array (
                 'alias' => 'expires',
                 'primary' => false,
                 'unique' => false,
                 'type' => 'BTREE',
-                'columns' =>
+                'columns' => 
                 array (
-                    'expires' =>
+                    'expires' => 
                     array (
                         'length' => '',
                         'collation' => 'A',
@@ -209,9 +209,9 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
                 ),
             ),
         ),
-        'aggregates' =>
+        'aggregates' => 
         array (
-            'Topic' =>
+            'Topic' => 
             array (
                 'class' => 'MODX\\Revolution\\Registry\\Db\\modDbRegisterTopic',
                 'local' => 'topic',

core/src/Revolution/mysql/modManagerLog.php

@@ -18,7 +18,7 @@ class modManagerLog extends \MODX\Revolution\modManagerLog
         'fields' => 
         array (
             'user' => 0,
-            'occurred' => NULL,
+            'occurred' => 'CURRENT_TIMESTAMP',
             'action' => '',
             'classKey' => '',
             'item' => '0',
@@ -38,8 +38,8 @@ class modManagerLog extends \MODX\Revolution\modManagerLog
             array (
                 'dbtype' => 'datetime',
                 'phptype' => 'datetime',
-                'null' => true,
-                'default' => NULL,
+                'null' => false,
+                'default' => 'CURRENT_TIMESTAMP',
             ),
             'action' => 
             array (

setup/includes/upgrades/common/3.1.0-db-changes.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * Database changes for 3.1
+ *
+ * @var modX $modx
+ * @package setup
+ */
+
+$manager = $modx->getManager();
+
+$manager->alterField(\MODX\Revolution\modManagerLog::class, 'occurred');

setup/includes/upgrades/mysql/3.1.0-pl.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * Specific upgrades for Revolution 3.1.0-pl
+ *
+ * @var modX $modx
+ * @package setup
+ * @subpackage upgrades
+ */
+
+/* run upgrades common to all db platforms */
+include dirname(__DIR__) . '/common/3.1.0-db-changes.php';