From 469a80ac09d3dac7674c0dae9a7bb3d2e6aed0b6 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 14 Jan 2012 18:11:21 +0100 Subject: [PATCH] fix some sqlite2 upgrade issues --- 3rdparty/MDB2/Driver/Manager/sqlite.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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)) { -- 2.39.5