]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix some sqlite2 upgrade issues
authorRobin Appelman <icewind@owncloud.com>
Sat, 14 Jan 2012 17:11:21 +0000 (18:11 +0100)
committerRobin Appelman <icewind@owncloud.com>
Sat, 14 Jan 2012 17:11:32 +0000 (18:11 +0100)
3rdparty/MDB2/Driver/Manager/sqlite.php

index 650910174e7028ca4e67791e326d2e046f4b1b2f..1b7239876f115f29d7f2cbc637b073186ee555ff 100644 (file)
@@ -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)) {