mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14119 from owncloud/dbal251 

Update doctrine/dbal to 2.5.1 #13537
This commit is contained in:
Thomas Müller 2015-02-23 20:59:51 +01:00
parent f54cd14c7e bdfc9b57bd
commit c350da1a28
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit 5142d69c5c467c651a7ef72ea1f09dcfb7ba25b5
Subproject commit 59f092231c6036838746262a4db80997908bb06f

3
lib/private/db/mdb2schemareader.php
View File

@ -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) {