Allow to default timestamp column to CURRENT_TIMESTAMP

vanilla · Jan 9, 2018 · 09c0ffd · 09c0ffd
1 parent d4039e2
commit 09c0ffd
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/library/database/class.mysqlstructure.php b/library/database/class.mysqlstructure.php
@@ -792,8 +792,14 @@ protected function _defineColumn($column, $newColumnName = null) {
             $return .= ' null';
         }
 
-        if (!is_null($column->Default) && $column->Type !== 'timestamp') {
-            $return .= " default ".self::_quoteValue($column->Default);
+        if (!is_null($column->Default)) {
+            if ($column->Type !== 'timestamp') {
+                $return .= " default ".self::_quoteValue($column->Default);
+            } else {
+                if (in_array(strtolower($column->Default), ['current_timestamp', 'current_timestamp()'])) {
+                    $return .= " default ".$column->Default;
+                }
+            }
         }
 
         if ($column->AutoIncrement) {