From 8d35de9b3985ee991b845651bc2d98e4aa091575 Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Thu, 22 Dec 2011 21:17:12 +0000 Subject: [PATCH] // Remove table discount_shop from upgrader --- install-dev/sql/upgrade/1.5.0.0.sql | 8 -------- install-new/upgrade/sql/1.5.0.0.sql | 8 -------- 2 files changed, 16 deletions(-) diff --git a/install-dev/sql/upgrade/1.5.0.0.sql b/install-dev/sql/upgrade/1.5.0.0.sql index 463a9aac7..182de138f 100755 --- a/install-dev/sql/upgrade/1.5.0.0.sql +++ b/install-dev/sql/upgrade/1.5.0.0.sql @@ -308,14 +308,6 @@ PRIMARY KEY (`id_scene`, `id_shop`), ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; INSERT INTO `PREFIX_scene_shop` (id_shop, id_scene) (SELECT 1, id_scene FROM PREFIX_scene); -CREATE TABLE `PREFIX_discount_shop` ( -`id_discount` INT( 11 ) UNSIGNED NOT NULL , -`id_shop` INT( 11 ) UNSIGNED NOT NULL, -PRIMARY KEY (`id_discount`, `id_shop`), - KEY `id_shop` (`id_shop`) -) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -INSERT INTO `PREFIX_discount_shop` (id_shop, id_discount) (SELECT 1, id_discount FROM PREFIX_discount); - ALTER TABLE `PREFIX_delivery` ADD `id_shop` INT UNSIGNED NULL DEFAULT NULL AFTER `id_delivery`, ADD `id_group_shop` INT UNSIGNED NULL DEFAULT NULL AFTER `id_shop`; /* PHP:create_multistore(); */; diff --git a/install-new/upgrade/sql/1.5.0.0.sql b/install-new/upgrade/sql/1.5.0.0.sql index c96d511aa..ba3492d32 100644 --- a/install-new/upgrade/sql/1.5.0.0.sql +++ b/install-new/upgrade/sql/1.5.0.0.sql @@ -311,14 +311,6 @@ PRIMARY KEY (`id_scene`, `id_shop`), ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; INSERT INTO `PREFIX_scene_shop` (id_shop, id_scene) (SELECT 1, id_scene FROM PREFIX_scene); -CREATE TABLE `PREFIX_discount_shop` ( -`id_discount` INT( 11 ) UNSIGNED NOT NULL , -`id_shop` INT( 11 ) UNSIGNED NOT NULL, -PRIMARY KEY (`id_discount`, `id_shop`), - KEY `id_shop` (`id_shop`) -) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -INSERT INTO `PREFIX_discount_shop` (id_shop, id_discount) (SELECT 1, id_discount FROM PREFIX_discount); - ALTER TABLE `PREFIX_delivery` ADD `id_shop` INT UNSIGNED NULL DEFAULT NULL AFTER `id_delivery`, ADD `id_group_shop` INT UNSIGNED NULL DEFAULT NULL AFTER `id_shop`; /* PHP:create_multistore(); */;