diff options
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | db_structure.xml | 2 | ||||
| -rw-r--r-- | lib/db/mdb2schemareader.php | 7 |
3 files changed, 7 insertions, 2 deletions
diff --git a/3rdparty b/3rdparty -Subproject c8623cc80d47022cb25874b69849cd2f57fd487 +Subproject 25e8568d41a9b9a6d1662ccf33058822a890e7f diff --git a/db_structure.xml b/db_structure.xml index 4c192ba028e..ef5de653033 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -383,7 +383,7 @@ <name>user</name> <type>text</type> <default></default> - <notnull>false</notnull> + <notnull>true</notnull> <length>64</length> </field> 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)); } } |