From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 14 Jan 2012 17:11:21 +0000 (+0100)
Subject: fix some sqlite2 upgrade issues
X-Git-Tag: v3.0~55
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=469a80ac09d3dac7674c0dae9a7bb3d2e6aed0b6;p=nextcloud-server.git

fix some sqlite2 upgrade issues
---

diff --git a/3rdparty/MDB2/Driver/Manager/sqlite.php b/3rdparty/MDB2/Driver/Manager/sqlite.php
index 650910174e7..1b7239876f1 100644
--- a/3rdparty/MDB2/Driver/Manager/sqlite.php
+++ b/3rdparty/MDB2/Driver/Manager/sqlite.php
@@ -600,7 +600,7 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
         }
         $constraints = array_flip($constraints);
         foreach ($constraints as $constraint => $value) {
-            if (!empty($definition['primary'])) {
+			if (!empty($definition['primary'])) {
                 if (!array_key_exists('primary', $options)) {
                     $options['primary'] = $definition['fields'];
                     //remove from the $constraint array, it's already handled by createTable()
@@ -682,7 +682,9 @@ class MDB2_Driver_Manager_sqlite extends MDB2_Driver_Manager_Common
         }
 
         foreach ($constraints as $constraint => $definition) {
-            $this->createConstraint($name_new, $constraint, $definition);
+			if(empty($definition['primary']) and empty($definition['foreign'])){
+				$this->createConstraint($name_new, $constraint, $definition);
+			}
         }
 
         if (!empty($select_fields) && !empty($data)) {