Skip to content
Browse files

// Fix upgrade

  • Loading branch information...
1 parent 15b26ee commit 3310d7582c4701dde9412cd83964a88f3ff1ff30 Damien Metzger committed Dec 31, 2012
Showing with 38 additions and 2 deletions.
  1. +35 −0 install-dev/upgrade/php/p1531_redirect_type.php
  2. +3 −2 install-dev/upgrade/sql/1.5.3.1.sql
View
35 install-dev/upgrade/php/p1531_redirect_type.php
@@ -0,0 +1,35 @@
+<?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 p1531_redirect_type()
+{
+ include_once(_PS_INSTALL_PATH_.'upgrade/php/generic_add_missing_column.php');
+
+ $result = generic_add_missing_column('product', array('redirect_type' => 'ENUM(\'\', \'404\', \'301\', \'302\') NOT NULL DEFAULT \'404\' AFTER `active`'));
+ $result &= generic_add_missing_column('product_shop', array('redirect_type' => 'ENUM(\'\', \'404\', \'301\', \'302\') NOT NULL DEFAULT \'404\' AFTER `active`'));
+
+ return $result;
+}
View
5 install-dev/upgrade/sql/1.5.3.1.sql
@@ -1,4 +1,5 @@
-ALTER TABLE `PREFIX_product` ADD `redirect_type` ENUM('', '404', '301', '302') NOT NULL DEFAULT '404' AFTER `active`;
-ALTER TABLE `PREFIX_product_shop` ADD `redirect_type` ENUM('', '404', '301', '302') NOT NULL DEFAULT '404' AFTER `active`;
+SET NAMES 'utf8';
+
+/* PHP:p1531_redirect_type(); */;
ALTER TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT NOT NULL;

0 comments on commit 3310d75

Please sign in to comment.
Something went wrong with that request. Please try again.