Fix handling of empty defaults in schema

remotes/origin/stable6
Bart Visscher 2013-03-17 15:25:41 +07:00
parent ee57ddd0b7
commit 2866376f34
1 changed files with 5 additions and 9 deletions

@ -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']);
}
}