diff options
| -rw-r--r-- | lib/private/DB/MDB2SchemaReader.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/private/DB/MDB2SchemaReader.php b/lib/private/DB/MDB2SchemaReader.php index abf58ffa053..687438495b1 100644 --- a/lib/private/DB/MDB2SchemaReader.php +++ b/lib/private/DB/MDB2SchemaReader.php @@ -260,8 +260,16 @@ class MDB2SchemaReader { $options['primary'] = true; } - $table->addColumn($name, $type, $options); + # not used anymore in the options argument + # see https://github.com/doctrine/dbal/commit/138eb85234a1faeaa2e6a32cd7bcc66bb51c64e8#diff-300f55366adb50a32a40882ebdc95c163b141f64cba5f45f20bda04a907b3eb3L82 + # therefore it's read before and then unset right before the addColumn call + $setPrimaryKey = false; if (!empty($options['primary']) && $options['primary']) { + $setPrimaryKey = true; + } + unset($options['primary']); + $table->addColumn($name, $type, $options); + if ($setPrimaryKey) { $table->setPrimaryKey([$name]); } } |