diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-02-26 10:28:39 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-02-26 10:28:39 +0100 |
| commit | b057ae2da13964bb79e51286f8a34ae595ee4a2f (patch) | |
| tree | 59374a6eecffd754b413d53d2250e3ccdd4e513f | |
| parent | bc1418156339d4e61fe81bd1474f91555432ca00 (diff) | |
| parent | 9e38e2c1a9326318f247a0efe95c3ab9b5b3664c (diff) | |
| download | nextcloud-server-b057ae2da13964bb79e51286f8a34ae595ee4a2f.tar.gz nextcloud-server-b057ae2da13964bb79e51286f8a34ae595ee4a2f.zip | |
Merge pull request #14515 from owncloud/stable8-dbal-251
[Stable8] Update doctrine/dbal to 251
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | lib/private/db/mdb2schemareader.php | 3 |
2 files changed, 3 insertions, 0 deletions
diff --git a/3rdparty b/3rdparty -Subproject b10ff36086131c5bddae739bae967bca368f01a +Subproject b6d348107465ff78e36bb530f71f1495b6ed47e diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php index 7dd4168fb6e..23104b1bc2d 100644 --- a/lib/private/db/mdb2schemareader.php +++ b/lib/private/db/mdb2schemareader.php @@ -293,6 +293,9 @@ class MDB2SchemaReader { } if (!empty($fields)) { if (isset($primary) && $primary) { + if ($table->hasPrimaryKey()) { + return; + } $table->setPrimaryKey($fields, $name); } else { if (isset($unique) && $unique) { |