Fix warning for DEFAULT 0 in schema

sledgehammer · Jul 26, 2018 · 32298ca · 32298ca
1 parent 0f71796
commit 32298ca
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/Backend/DatabaseRepositoryBackend.php b/src/Backend/DatabaseRepositoryBackend.php
@@ -511,8 +511,12 @@ private function getSchemaMySql($db, $prefix = '')
 
                             case 'DEFAULT':
                                 $default = '';
-                                while ($part = $parts[$i + 1]) {
+                                while (true) {
                                     ++$i;
+                                    if (array_key_exists($i, $parts) === false) {
+                                        break;
+                                    }
+                                    $part = $parts[$i];
                                     $default .= $part;
                                     if (substr($default, 0, 1) != "'") { // Not a quoted string value?
                                         break; // end for loop
@@ -529,11 +533,18 @@ private function getSchemaMySql($db, $prefix = '')
                                         case 'NULL':
                                             $default = null;
                                             break;
+                                        case 'current_timestamp()':
                                         case 'CURRENT_TIMESTAMP':
                                             $default = null;
                                             break;
                                         default:
-                                            notice('Unknown default "'.$default.'" in "'.$line.'"');
+                                            if (preg_match('/^[0-9]+$/', $default)) {
+                                                $default = (int) $default;
+                                            } elseif (preg_match('/^[0-9]*\.[0-9+]+$/', $default)) {
+                                                $default = (float) $default;
+                                            } else {
+                                                notice('Unknown default "'.$default.'" in "'.$line.'"');
+                                            }
                                             break;
                                     }
                                     $config['columns'][$column]['default'] = $default;