[-] Installer : fixed wrong return value in upgrade script

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16820 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger committed 2012-08-13 11:51:11 +00:00
1 parent 90ce1a292d
commit ccf4344a2d
1 file changed
+14 -12
@@ -28,17 +28,19 @@
function fix_unique_specific_price() function fix_unique_specific_price()
{ {
$res = Db::getInstance()->executeS('SELECT MIN(id_specific_price) id_specific_price $result = Db::getInstance()->executeS('
SELECT MIN(id_specific_price) id_specific_price
FROM '._DB_PREFIX_.'specific_price FROM '._DB_PREFIX_.'specific_price
GROUP BY `id_product`, `id_shop`, `id_currency`, `id_country`, `id_group`, `from_quantity`, `from`, `to` GROUP BY `id_product`, `id_shop`, `id_currency`, `id_country`, `id_group`, `from_quantity`, `from`, `to`');
'); if (!$result || !count($result))
if ($res) return true; // return tru if there is not any specific price in the database
{
$ids_specific_price = '('; $sql = '';
foreach ($res as $row) foreach ($result as $row)
$ids_specific_price .= (int)$row['id_specific_price'].','; $sql .= (int)$row['id_specific_price'].',';
$ids_specific_price = rtrim($ids_specific_price, ',').')'; $sql = rtrim($sql, ',');
return Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'specific_price
WHERE id_specific_price NOT IN ('.$ids_specific_price.')'); return Db::getInstance()->execute('
} DELETE FROM '._DB_PREFIX_.'specific_price
WHERE id_specific_price NOT IN ('.$sql.')');
} }