From 8d698649333c8ee8d2057331c0cfaed3bd4ef549 Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Thu, 22 Dec 2011 16:07:18 +0000 Subject: [PATCH] // Fixes to upgrader sql git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11626 b9a71923-0436-4b27-9f14-aed3839534dd --- install-dev/sql/upgrade/1.5.0.0.sql | 3 --- install-dev/sql/upgrade/1.5.0.1.sql | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/install-dev/sql/upgrade/1.5.0.0.sql b/install-dev/sql/upgrade/1.5.0.0.sql index c96d511aa..463a9aac7 100755 --- a/install-dev/sql/upgrade/1.5.0.0.sql +++ b/install-dev/sql/upgrade/1.5.0.0.sql @@ -238,11 +238,9 @@ PRIMARY KEY ( `id_shop` , `id_product` ), INSERT INTO `PREFIX_product_shop` (id_shop, id_product) (SELECT 1, id_product FROM PREFIX_product); ALTER TABLE `PREFIX_category_lang` ADD `id_shop` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `id_category`; -ALTER TABLE `PREFIX_category_lang` DROP INDEX `category_lang_index`; ALTER TABLE `PREFIX_category_lang` ADD UNIQUE KEY( `id_category`, `id_shop`, `id_lang`); ALTER TABLE `PREFIX_product_lang` ADD `id_shop` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `id_product`; -ALTER TABLE `PREFIX_product_lang` DROP INDEX `product_lang_index` ; ALTER TABLE `PREFIX_product_lang` ADD UNIQUE KEY ( `id_product`, `id_shop` , `id_lang`); ALTER TABLE `PREFIX_specific_price` CHANGE `id_shop` `id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1'; @@ -277,7 +275,6 @@ 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 INDEX `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-dev/sql/upgrade/1.5.0.1.sql b/install-dev/sql/upgrade/1.5.0.1.sql index bfecae976..f535e59bd 100644 --- a/install-dev/sql/upgrade/1.5.0.1.sql +++ b/install-dev/sql/upgrade/1.5.0.1.sql @@ -237,7 +237,7 @@ ALTER TABLE `PREFIX_carrier` ADD `position` INT( 10 ) UNSIGNED NOT NULL DEFAULT /* PHP:add_carrier_position();*/; ALTER TABLE `PREFIX_order_state` ADD COLUMN `shipped` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0 AFTER `delivery`; -UPDATE `PREFIX_order_state` SET `shipped` = 1 WHERE id_order_states IN (4, 5); +UPDATE `PREFIX_order_state` SET `shipped` = 1 WHERE id_order_state IN (4, 5); CREATE TABLE `PREFIX_order_invoice` ( `id_order_invoice` int(11) NOT NULL AUTO_INCREMENT, @@ -419,8 +419,8 @@ INSERT INTO `PREFIX_cart_rule` ( ); RENAME TABLE `PREFIX_discount_lang` TO `PREFIX_cart_rule_lang`; -ALTER TABLE `PREFIX_discount_lang` CHANGE `id_discount` `id_cart_rule` int(10) unsigned NOT NULL; -ALTER TABLE `PREFIX_discount_lang` CHANGE `description` `name` varchar(254) NOT NULL; +ALTER TABLE `PREFIX_cart_rule_lang` CHANGE `id_discount` `id_cart_rule` int(10) unsigned NOT NULL; +ALTER TABLE `PREFIX_cart_rule_lang` CHANGE `description` `name` varchar(254) NOT NULL; RENAME TABLE `PREFIX_discount_category` TO `PREFIX_cart_rule_product_rule_value`; ALTER TABLE `PREFIX_cart_rule_product_rule_value` CHANGE `id_category` `id_item` int(10) unsigned NOT NULL; ALTER TABLE `PREFIX_cart_rule_product_rule_value` CHANGE `id_discount` `id_product_rule` int(10) unsigned NOT NULL;