From 1330eee259109b012812f77f2e1063ed4e50f6fd Mon Sep 17 00:00:00 2001 From: dMetzger Date: Wed, 30 May 2012 12:31:50 +0000 Subject: [PATCH] // Fixing differences between install and update --- install-dev/upgrade/sql/1.5.0.1.sql | 2 +- install-dev/upgrade/sql/1.5.0.2.sql | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/install-dev/upgrade/sql/1.5.0.1.sql b/install-dev/upgrade/sql/1.5.0.1.sql index 61b1080df..709a2c7c6 100644 --- a/install-dev/upgrade/sql/1.5.0.1.sql +++ b/install-dev/upgrade/sql/1.5.0.1.sql @@ -418,7 +418,7 @@ UPDATE `PREFIX_cart_rule` SET product_restriction = 1 WHERE `id_cart_rule` IN (S ALTER TABLE `PREFIX_cart_discount` CHANGE `id_discount` `id_cart_rule` int(10) unsigned NOT NULL; ALTER TABLE `PREFIX_order_discount` CHANGE `id_discount` `id_cart_rule` int(10) unsigned NOT NULL; -ALTER TABLE `PREFIX_order_discount` CHANGE `id_order_discount` `id_order_cart_rule` int(10) unsigned NOT NULL; +ALTER TABLE `PREFIX_order_discount` CHANGE `id_order_discount` `id_order_cart_rule` int(10) unsigned NOT NULL AUTO_INCREMENT; RENAME TABLE `PREFIX_order_discount` TO `PREFIX_order_cart_rule`; RENAME TABLE `PREFIX_cart_discount` TO `PREFIX_cart_cart_rule`; diff --git a/install-dev/upgrade/sql/1.5.0.2.sql b/install-dev/upgrade/sql/1.5.0.2.sql index 2cde75ba4..597055560 100644 --- a/install-dev/upgrade/sql/1.5.0.2.sql +++ b/install-dev/upgrade/sql/1.5.0.2.sql @@ -334,22 +334,6 @@ ALTER TABLE `PREFIX_order_detail` ADD `tax_computation_method` tinyint(1) unsign /* PHP:migrate_orders(); */; -CREATE TABLE IF NOT EXISTS `PREFIX_linksmenutop` ( - `id_link` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - `id_shop` INT UNSIGNED NOT NULL, - `new_window` TINYINT( 1 ) NOT NULL, - `link` VARCHAR( 128 ) NOT NULL, - INDEX (`id_shop`) -) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; - -CREATE TABLE IF NOT EXISTS `PREFIX_linksmenutop_lang` ( - `id_link` INT NOT NULL, - `id_lang` INT NOT NULL, - `id_shop` INT NOT NULL, - `label` VARCHAR( 128 ) NOT NULL , - INDEX ( `id_link` , `id_lang`, `id_shop`) -) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; - ALTER TABLE `PREFIX_order_invoice` ADD `delivery_number` int(0) NOT NULL DEFAULT '0' AFTER `number`; ALTER TABLE `PREFIX_order_invoice` ADD `delivery_date` datetime AFTER `delivery_number`;