Fix invalid default value for timestamp column.

Author: prwater

src/MySql/Metadata/ColumnMetadata.php

@@ -47,14 +47,14 @@ public function getColumnAuditDefinition(): string
 
     $parts[] = ($this->getProperty('is_nullable')=='YES') ? 'null' : 'not null';
 
-    if ($this->getProperty('column_default')!==null && $this->getProperty('column_default')!='NULL')
+    if ($this->getProperty('column_default')!==null && mb_strtoupper($this->getProperty('column_default'))!=='NULL')
     {
       $parts[] = 'default '.$this->getProperty('column_default');
     }
-    elseif ($this->getProperty('column_type')=='timestamp')
+    elseif ($this->getProperty('column_type')==='timestamp')
     {
       // Prevent automatic updates of timestamp columns.
-      $parts[] = 'default now()';
+      $parts[] = 'default null';
     }
 
     return implode(' ', $parts);

test/MySql/AlterAuditTableCommand/testMany/expected.sql

@@ -2,6 +2,6 @@ alter table `test_audit`.`TABLE1` engine InnoDB default character set utf8 defau
 
 alter table `test_audit`.`TABLE1`
   change column `col1`   `col1`   int(8) null,
-  change column `col10`  `col10`  timestamp null default now(),
+  change column `col10`  `col10`  timestamp null default null,
   change column `col100` `col100` varchar(10) character set ascii collate ascii_bin null
 ;

test/MySql/AlterAuditTableCommand/testMultipleColumns/expected.sql

@@ -1,5 +1,5 @@
 alter table `test_audit`.`TABLE1`
   change column `col1`   `col1`   int(8) null,
-  change column `col10`  `col10`  timestamp null default now(),
+  change column `col10`  `col10`  timestamp null default null,
   change column `col100` `col100` varchar(10) character set ascii collate ascii_bin null
 ;

test/MySql/AlterAuditTableCommand/testTimestampColumn/expected.sql

@@ -1,3 +1,3 @@
 alter table `test_audit`.`TABLE1`
-  change column `col1` `col1` timestamp null default now()
+  change column `col1` `col1` timestamp null default null
 ;

test/MySql/AuditCommand/TimestampColumn/TimestampColumnTest.php

@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+
+namespace SetBased\Audit\Test\MySql\AuditCommand\TimestampColumn;
+
+use SetBased\Audit\MySql\AuditDataLayer;
+use SetBased\Audit\Test\MySql\AuditCommand\AuditCommandTestCase;
+use SetBased\Stratum\Middle\Helper\RowSetHelper;
+
+/**
+ * Tests for running audit on a table with timestamp column table.
+ */
+class TimestampColumnTest extends AuditCommandTestCase
+{
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * @inheritdoc
+   */
+  public static function setUpBeforeClass(): void
+  {
+    self::$dir = __DIR__;
+
+    parent::setUpBeforeClass();
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+  public function test01(): void
+  {
+    $this->runAudit();
+
+    // TABLE1 MUST exist.
+    $tables = AuditDataLayer::$dl->getTablesNames(self::$auditSchema);
+    self::assertNotNull(RowSetHelper::searchInRowSet($tables, 'table_name', 'TABLE1'));
+
+    // TABLE1 MUST have triggers.
+    $triggers = AuditDataLayer::$dl->getTableTriggers(self::$dataSchema, 'TABLE1');
+    self::assertNotNull(RowSetHelper::searchInRowSet($triggers, 'trigger_name', 'trg_audit_t1_insert'));
+    self::assertNotNull(RowSetHelper::searchInRowSet($triggers, 'trigger_name', 'trg_audit_t1_update'));
+    self::assertNotNull(RowSetHelper::searchInRowSet($triggers, 'trigger_name', 'trg_audit_t1_delete'));
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+}
+
+//----------------------------------------------------------------------------------------------------------------------

test/MySql/AuditCommand/TimestampColumn/config/audit.json

@@ -0,0 +1,28 @@
+{
+    "database": {
+        "host": "localhost",
+        "user": "test",
+        "password": "test",
+        "data_schema": "test_data",
+        "audit_schema": "test_audit"
+    },
+    "audit_columns": [
+        {
+            "column_name": "audit_statement",
+            "column_type": "enum('INSERT','DELETE','UPDATE') not null",
+            "value_type": "ACTION"
+        },
+        {
+            "column_name": "audit_type",
+            "column_type": "enum('OLD','NEW') not null",
+            "value_type": "STATE"
+        }
+    ],
+    "tables": {
+        "TABLE1": {
+            "audit": true,
+            "skip": null,
+            "alias": "t1"
+        }
+    }
+}

test/MySql/AuditCommand/TimestampColumn/config/setup.sql

@@ -0,0 +1,5 @@
+drop table if exists `TABLE1`;
+
+create table `TABLE1` (
+  `poo_rank_last_update` timestamp null default null
+);