From 7faa0b74b19425f6166d70f8e80d37712e115fe4 Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Fri, 25 May 2012 13:43:41 +0000
Subject: [PATCH] // fix #PSCFV-905 fix

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15692 b9a71923-0436-4b27-9f14-aed3839534dd
---
 ...15010_drop_column_id_address_if_exists.php | 43 +++++++++++++++++++
 install-dev/upgrade/sql/1.5.0.10.sql          |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 install-dev/upgrade/php/p15010_drop_column_id_address_if_exists.php

diff --git a/install-dev/upgrade/php/p15010_drop_column_id_address_if_exists.php b/install-dev/upgrade/php/p15010_drop_column_id_address_if_exists.php
new file mode 100644
index 000000000..fcf47b694
--- /dev/null
+++ b/install-dev/upgrade/php/p15010_drop_column_id_address_if_exists.php
@@ -0,0 +1,43 @@
+<?php
+/*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+function p15010_drop_column_id_address_if_exists()
+{
+	$res = true;
+	$exists = Db::getInstance()->executeS('SHOW TABLES LIKE "'._DB_PREFIX_.'supplier"');
+	if (count($exists))
+	{
+		$fields = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'supplier`');
+		foreach ($fields as $k => $field)
+			$fields[$k] = $field['Field'];
+
+		if (in_array('id_address', $fields))
+			$res &= Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'supplier` 
+				DROP `id_address`');
+	}
+	return $res;
+}
diff --git a/install-dev/upgrade/sql/1.5.0.10.sql b/install-dev/upgrade/sql/1.5.0.10.sql
index df4acb34b..99860f0f5 100644
--- a/install-dev/upgrade/sql/1.5.0.10.sql
+++ b/install-dev/upgrade/sql/1.5.0.10.sql
@@ -1,6 +1,6 @@
 /* PHP:module_blockwishlist_multishop(); */;
 
-ALTER TABLE `PREFIX_supplier` DROP `id_address`;
+/* PHP:p15010_drop_column_id_address_if_exists(); */;
 
 UPDATE `PREFIX_meta` SET `page` = 'contact' WHERE `page` = 'contact-form';