Fix handling of empty defaults in schema

diff --git a/lib/db/mdb2schemareader.php b/lib/db/mdb2schemareader.php
index 6408c27e916306cb93cfd285b41f919f1b676289..1d71af1700cfcdcd8a4803422e1e43fd055085b7 100644 (file)
--- a/lib/db/mdb2schemareader.php
+++ b/lib/db/mdb2schemareader.php
@@ -124,17 +124,13 @@ class OC_DB_MDB2SchemaReader {
                }
                if (isset($name) && isset($type)) {
                        if (empty($options['default'])) {
+                               if (empty($options['notnull']) || !$options['notnull']) {
+                                       unset($options['default']);
+                               }
                                if ($type == 'integer') {
-                                       if (empty($options['default'])) {
-                                               if (empty($options['notnull'])) {
-                                                       unset($options['default']);
-                                               }
-                                               else {
-                                                       $options['default'] = 0;
-                                               }
-                                       }
+                                       $options['default'] = 0;
                                }
-                               if (!empty($options['autoincrement'])) {
+                               if (!empty($options['autoincrement']) && $options['autoincrement']) {
                                        unset($options['default']);
                                }
                        }