summaryrefslogtreecommitdiffstats
path: root/lib/db/mdb2schemareader.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/db/mdb2schemareader.php')
-rw-r--r--lib/db/mdb2schemareader.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/db/mdb2schemareader.php b/lib/db/mdb2schemareader.php
index 4dc1fd4616d..0ead9528c93 100644
--- a/lib/db/mdb2schemareader.php
+++ b/lib/db/mdb2schemareader.php
@@ -148,6 +148,8 @@ class OC_DB_MDB2SchemaReader {
if (empty($options['notnull']) || !$options['notnull']) {
unset($options['default']);
$options['notnull'] = false;
+ } else {
+ $options['default'] = '';
}
if ($type == 'integer') {
$options['default'] = 0;
@@ -165,9 +167,12 @@ class OC_DB_MDB2SchemaReader {
$type = 'bigint';
}
}
- $table->addColumn($name, $type, $options);
if (!empty($options['autoincrement'])
&& !empty($options['notnull'])) {
+ $options['primary'] = true;
+ }
+ $table->addColumn($name, $type, $options);
+ if (!empty($options['primary']) && $options['primary']) {
$table->setPrimaryKey(array($name));
}
}