Merge pull request #3714 from gRoussac/PSCSX-6535

[-] IN : Fix #PSCSX-6535 + PSCSX-6346 adding id_cart to id_product_2 …
PrestaShop · Aug 20, 2015 · fdf275e · fdf275e
2 parents a9fcf7d + 42e8dfa
commit fdf275e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql
@@ -1797,7 +1797,7 @@ CREATE TABLE `PREFIX_specific_price` (
 	KEY `from_quantity` (`from_quantity`),
 	KEY (`id_specific_price_rule`),
 	KEY (`id_cart`),
-  UNIQUE KEY `id_product_2` (`id_product`,`id_shop`,`id_shop_group`,`id_currency`,`id_country`,`id_group`,`id_customer`,`id_product_attribute`,`from_quantity`,`id_specific_price_rule`,`from`,`to`)
+  UNIQUE KEY `id_product_2` (`id_cart`, `id_product`,`id_shop`,`id_shop_group`,`id_currency`,`id_country`,`id_group`,`id_customer`,`id_product_attribute`,`from_quantity`,`id_specific_price_rule`,`from`,`to`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
 
 CREATE TABLE `PREFIX_state` (

diff --git a/install-dev/upgrade/sql/1.6.1.0.sql b/install-dev/upgrade/sql/1.6.1.0.sql
@@ -209,7 +209,7 @@ INSERT INTO `PREFIX_hook` (`name`, `title`, `description`) VALUES ('displayInvoi
 
 UPDATE `PREFIX_hook` SET position = 0 WHERE name LIKE 'action%';
 
-ALTER IGNORE TABLE `PREFIX_specific_price` ADD UNIQUE KEY `id_product_2` (`id_product`,`id_shop`,`id_shop_group`,`id_currency`,`id_country`,`id_group`,`id_customer`,`id_product_attribute`,`from_quantity`,`id_specific_price_rule`,`from`,`to`);
+ALTER IGNORE TABLE `PREFIX_specific_price` ADD UNIQUE KEY `id_product_2` (`id_cart`, `id_product`,`id_shop`,`id_shop_group`,`id_currency`,`id_country`,`id_group`,`id_customer`,`id_product_attribute`,`from_quantity`,`id_specific_price_rule`,`from`,`to`);
 
 INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`)
   VALUES ('PS_INVCE_INVOICE_ADDR_RULES', '{"avoid":["vat_number","phone","phone_mobile"]}', NOW(), NOW());

diff --git a/install-dev/upgrade/sql/1.6.1.1.sql b/install-dev/upgrade/sql/1.6.1.1.sql
@@ -4,3 +4,7 @@ ALTER TABLE `PREFIX_customer_message` CHANGE `message` `message` MEDIUMTEXT NOT
 UPDATE `PREFIX_tax_rules_group` SET `date_add` = NOW(), `date_upd` = NOW() WHERE `date_add` = '0000-00-00 00:00:00';
 
 ALTER TABLE  `PREFIX_order_detail` ADD  `original_wholesale_price` DECIMAL( 20, 6 ) NOT NULL DEFAULT  '0.000000';
+
+ALTER TABLE `PREFIX_specific_price` DROP KEY `id_product_2`;
+
+ALTER IGNORE TABLE `PREFIX_specific_price` ADD UNIQUE KEY `id_product_2` (`id_cart`, `id_product`,`id_shop`,`id_shop_group`,`id_currency`,`id_country`,`id_group`,`id_customer`,`id_product_attribute`,`from_quantity`,`id_specific_price_rule`,`from`,`to`);