Merge pull request #14119 from owncloud/dbal251
Update doctrine/dbal to 2.5.1 #13537
This commit is contained in:
commit
c350da1a28
2
3rdparty
2
3rdparty
|
@ -1 +1 @@
|
||||||
Subproject commit 5142d69c5c467c651a7ef72ea1f09dcfb7ba25b5
|
Subproject commit 59f092231c6036838746262a4db80997908bb06f
|
|
@ -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) {
|
||||||
|
|
Loading…
Reference in New Issue