Added support to new default constants for date/time fields;

edgardmessias · Jul 14, 2015 · e3666ea · e3666ea
1 parent a91571c
commit e3666ea
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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);
             }