Skip to content
Snippets Groups Projects
Commit c350da1a authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge pull request #14119 from owncloud/dbal251

Update doctrine/dbal to 2.5.1 #13537
parents f54cd14c bdfc9b57
No related branches found
No related tags found
No related merge requests found
Subproject commit 5142d69c5c467c651a7ef72ea1f09dcfb7ba25b5 Subproject commit 59f092231c6036838746262a4db80997908bb06f
...@@ -312,6 +312,9 @@ class MDB2SchemaReader { ...@@ -312,6 +312,9 @@ class MDB2SchemaReader {
} }
if (!empty($fields)) { if (!empty($fields)) {
if (isset($primary) && $primary) { if (isset($primary) && $primary) {
if ($table->hasPrimaryKey()) {
return;
}
$table->setPrimaryKey($fields, $name); $table->setPrimaryKey($fields, $name);
} else { } else {
if (isset($unique) && $unique) { if (isset($unique) && $unique) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment