From e3666ea49ed3183f14b6080bb8f5b90518c6ef2b Mon Sep 17 00:00:00 2001 From: Edgard Lorraine Messias Date: Tue, 14 Jul 2015 17:32:15 -0300 Subject: [PATCH] Added support to new default constants for date/time fields; --- Schema.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Schema.php b/Schema.php index b1ae2b9..99c8ff1 100644 --- a/Schema.php +++ b/Schema.php @@ -345,8 +345,9 @@ protected function loadColumnSchema($column) $c->defaultValue = null; if ($defaultValue !== null) { - if ($c->type == self::TYPE_TIMESTAMP && trim($defaultValue) == 'CURRENT_TIMESTAMP') { - $c->defaultValue = new \yii\db\Expression('CURRENT_TIMESTAMP'); + if (in_array($c->type, [self::TYPE_DATE, self::TYPE_DATETIME, self::TYPE_TIME, self::TYPE_TIMESTAMP]) + && preg_match('/(CURRENT_|NOW|NULL|TODAY|TOMORROW|YESTERDAY)/i', $defaultValue)) { + $c->defaultValue = new \yii\db\Expression(trim($defaultValue)); } else { $c->defaultValue = $c->phpTypecast($defaultValue); }