From c393edbd5b73e8ffa49eaae49bc252732d754a84 Mon Sep 17 00:00:00 2001 From: mMarinetti Date: Wed, 18 Jan 2012 17:56:16 +0000 Subject: [PATCH] // fix related to sql queries --- ...lumn_order_state_deleted_if_not_exists.php | 36 +++++++++++++++++++ ..._column_orders_reference_if_not_exists.php | 35 ++++++++++++++++++ install-new/upgrade/sql/1.5.0.0.sql | 1 + install-new/upgrade/sql/1.5.0.1.sql | 4 +-- install-new/upgrade/sql/1.5.0.4.sql | 3 +- 5 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 install-new/upgrade/php/add_column_order_state_deleted_if_not_exists.php create mode 100644 install-new/upgrade/php/add_column_orders_reference_if_not_exists.php diff --git a/install-new/upgrade/php/add_column_order_state_deleted_if_not_exists.php b/install-new/upgrade/php/add_column_order_state_deleted_if_not_exists.php new file mode 100644 index 000000000..da17e7384 --- /dev/null +++ b/install-new/upgrade/php/add_column_order_state_deleted_if_not_exists.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 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 add_column_order_state_deleted_if_not_exists() +{ + $column = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'order_state` LIKE "deleted"'); + error(Db::getInstance()->getMsgError()); + if (empty($column)) + return Db::getInstance()->execute('ALTER TABLE `PREFIX_order_state` + ADD COLUMN `deleted` tinyint(1) UNSIGNED NOT NULL default "0" AFTER `paid`'); + return true; +} diff --git a/install-new/upgrade/php/add_column_orders_reference_if_not_exists.php b/install-new/upgrade/php/add_column_orders_reference_if_not_exists.php new file mode 100644 index 000000000..a59707fe3 --- /dev/null +++ b/install-new/upgrade/php/add_column_orders_reference_if_not_exists.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2011 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 add_column_orders_reference_if_not_exists() +{ + $column = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'orders` LIKE "reference"'); + error(Db::getInstance()->getMsgError()); + if (empty($column)) + return Db::getInstance()->execute('ALTER TABLE `PREFIX_orders` ADD COLUMN `reference` varchar(9) AFTER `id_order`'); + return true; +} diff --git a/install-new/upgrade/sql/1.5.0.0.sql b/install-new/upgrade/sql/1.5.0.0.sql index 3e3e77da2..4cc348a4e 100755 --- a/install-new/upgrade/sql/1.5.0.0.sql +++ b/install-new/upgrade/sql/1.5.0.0.sql @@ -279,6 +279,7 @@ ALTER TABLE `PREFIX_module_group` DROP PRIMARY KEY; ALTER TABLE `PREFIX_module_group` ADD PRIMARY KEY (`id_module`, `id_shop`, `id_group`); ALTER TABLE `PREFIX_carrier_lang` ADD `id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1' AFTER `id_carrier`; +ALTER TABLE `PREFIX_carrier_lang` DROP KEY `shipper_lang_index`; ALTER TABLE `PREFIX_carrier_lang` ADD UNIQUE `shipper_lang_index` (`id_carrier`, `id_shop`, `id_lang`); ALTER TABLE `PREFIX_search_word` ADD `id_shop` INT(11) NOT NULL DEFAULT '1' AFTER `id_word`; diff --git a/install-new/upgrade/sql/1.5.0.1.sql b/install-new/upgrade/sql/1.5.0.1.sql index 52473655b..1a4a64fe2 100644 --- a/install-new/upgrade/sql/1.5.0.1.sql +++ b/install-new/upgrade/sql/1.5.0.1.sql @@ -65,8 +65,6 @@ ALTER TABLE `PREFIX_tax_rule` ADD `behavior` INT NOT NULL AFTER `zipcode_to`, ADD `description` VARCHAR( 100 ) NOT NULL AFTER `id_tax`; -ALTER TABLE `PREFIX_tax_rule` DROP INDEX tax_rule; - INSERT INTO `PREFIX_tax_rule` (`id_tax_rules_group`, `id_country`, `id_state`, `id_tax`, `behavior`, `zipcode_from`, `zipcode_to`, `id_county`, @@ -531,7 +529,7 @@ ALTER TABLE `PREFIX_specific_price` DROP INDEX `id_product`; ALTER TABLE `PREFIX_specific_price` ADD INDEX `id_product` (`id_product`, `id_product_attribute`, `id_shop`, `id_currency`, `id_country`, `id_group`, `from_quantity`, `from`, `to`); -ALTER TABLE `PREFIX_orders` ADD COLUMN `reference` varchar(9) AFTER `id_order`; +/* PHP:add_column_orders_reference_if_not_exists(); */; ALTER TABLE `PREFIX_orders` ADD COLUMN `id_warehouse` int(10) unsigned DEFAULT 0 AFTER `id_carrier`; ALTER TABLE `PREFIX_cart` ADD COLUMN `order_reference` varchar(9) AFTER `id_cart`; diff --git a/install-new/upgrade/sql/1.5.0.4.sql b/install-new/upgrade/sql/1.5.0.4.sql index 05b91d678..e6f161ef7 100644 --- a/install-new/upgrade/sql/1.5.0.4.sql +++ b/install-new/upgrade/sql/1.5.0.4.sql @@ -1,7 +1,6 @@ SET NAMES 'utf8'; - -ALTER TABLE `PREFIX_order_state` ADD COLUMN `deleted` tinyint(1) UNSIGNED NOT NULL default '0' AFTER `paid`; +/* PHP:add_column_order_state_deleted_if_not_exists(); */; ALTER TABLE `PREFIX_category` ADD COLUMN `is_root_category` tinyint(1) NOT NULL default '0' AFTER `position`;