diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-23 20:59:51 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-23 20:59:51 +0100 |
| commit | c350da1a283be82ba4d535069d5d760fb3355e5a (patch) | |
| tree | ffdbf599c5dcd2c2368506854ec5d0ddf86b7ce8 | |
| parent | f54cd14c7e7ea3a8e63ce35b3ac2c3ff5db984f5 (diff) | |
| parent | bdfc9b57bdf6d7660ac30341d7ca4c4a3419d34b (diff) | |
| download | nextcloud-server-c350da1a283be82ba4d535069d5d760fb3355e5a.tar.gz nextcloud-server-c350da1a283be82ba4d535069d5d760fb3355e5a.zip | |
Merge pull request #14119 from owncloud/dbal251
Update doctrine/dbal to 2.5.1 #13537
| 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 5142d69c5c467c651a7ef72ea1f09dcfb7ba25b +Subproject 59f092231c6036838746262a4db80997908bb06 diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php index efd0b26c9ea..3d507760625 100644 --- a/lib/private/db/mdb2schemareader.php +++ b/lib/private/db/mdb2schemareader.php @@ -312,6 +312,9 @@ class MDB2SchemaReader { } if (!empty($fields)) { if (isset($primary) && $primary) { + if ($table->hasPrimaryKey()) { + return; + } $table->setPrimaryKey($fields, $name); } else { if (isset($unique) && $unique) { |