From f296f4e642d52d38113b485cd520d4b069946082 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Fri, 28 Dec 2012 16:08:21 +0100
Subject: [PATCH] //small fix in upgrade

---
 .../php/generic_add_missing_column.php        | 15 ++++---
 .../php/outstanding_allow_amount1530.php      | 41 +++++++++++++++++++
 install-dev/upgrade/sql/1.5.3.0.sql           |  2 +-
 3 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 install-dev/upgrade/php/outstanding_allow_amount1530.php

diff --git a/install-dev/upgrade/php/generic_add_missing_column.php b/install-dev/upgrade/php/generic_add_missing_column.php
index 99dba79f9..70bf81df3 100644
--- a/install-dev/upgrade/php/generic_add_missing_column.php
+++ b/install-dev/upgrade/php/generic_add_missing_column.php
@@ -28,12 +28,15 @@ function generic_add_missing_column($table, $column_to_add)
 {
 	$column_exist = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.$table.'`');
 	$column_formated = array();
-
-	foreach($column_exist as $c)
-		$column_formated[] = $c['Field'] ;
 	$res = true;
-	foreach($column_to_add as $name => $details)
-		if (!in_array($name, $column_formated))
-			$res &= Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.$table.'` ADD COLUMN `'.$name.'` '.$details);
+	if ($column_exist)
+	{
+		foreach($column_exist as $c)
+			$column_formated[] = $c['Field'] ;
+		
+		foreach($column_to_add as $name => $details)
+			if (!in_array($name, $column_formated))
+				$res &= Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.$table.'` ADD COLUMN `'.$name.'` '.$details);
+	}
 	return $res;
 }
\ No newline at end of file
diff --git a/install-dev/upgrade/php/outstanding_allow_amount1530.php b/install-dev/upgrade/php/outstanding_allow_amount1530.php
new file mode 100644
index 000000000..4c3fcb8e4
--- /dev/null
+++ b/install-dev/upgrade/php/outstanding_allow_amount1530.php
@@ -0,0 +1,41 @@
+<?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
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+function outstanding_allow_amount1530()
+{
+	$column_exist = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'address`');
+	$column_formated = array();
+	$res = true;
+	if ($column_exist)
+	{
+		foreach($column_exist as $c)
+			$column_formated[] = $c['Field'] ;
+		
+		if (in_array('outstanding_allow_amount' , $column_formated))
+			Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'address` CHANGE  `outstanding_allow_amount` `outstanding_allow_amount` DECIMAL(20, 6) NOT NULL DEFAULT 0.000000');
+	}
+	return $res;
+}
\ No newline at end of file
diff --git a/install-dev/upgrade/sql/1.5.3.0.sql b/install-dev/upgrade/sql/1.5.3.0.sql
index a29a7e98a..28ad1a3f4 100644
--- a/install-dev/upgrade/sql/1.5.3.0.sql
+++ b/install-dev/upgrade/sql/1.5.3.0.sql
@@ -1,6 +1,6 @@
 SET NAMES 'utf8';
 
-ALTER TABLE `PREFIX_address` CHANGE  `outstanding_allow_amount` `outstanding_allow_amount` DECIMAL(20, 6) NOT NULL DEFAULT '0.000000';
+/* PHP:outstanding_allow_amount1530(); */;
 
 /* PHP:blocknewsletter1530(); */;