From f17b86521448518bec1424fa0215054513c83edd Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 1 Jul 2013 19:23:42 +0200 Subject: [PATCH] (-] INSTALLER Remove errors during upgrade --- install-dev/upgrade/php/p15012_add_missing_columns.php | 4 ++-- install-dev/upgrade/sql/1.5.0.0.sql | 3 ++- install-dev/upgrade/sql/1.5.0.2.sql | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) mode change 100644 => 100755 install-dev/upgrade/php/p15012_add_missing_columns.php mode change 100644 => 100755 install-dev/upgrade/sql/1.5.0.2.sql diff --git a/install-dev/upgrade/php/p15012_add_missing_columns.php b/install-dev/upgrade/php/p15012_add_missing_columns.php old mode 100644 new mode 100755 index 8fb9569f9..21dce2f94 --- a/install-dev/upgrade/php/p15012_add_missing_columns.php +++ b/install-dev/upgrade/php/p15012_add_missing_columns.php @@ -48,7 +48,7 @@ function p15012_add_missing_columns() $q_list['cart_product']['id_shop']['mod'] = 'ALTER TABLE `'._DB_PREFIX_.'cart_product` CHANGE `id_shop` `id_shop` int(10) unsigned NOT NULL DEFAULT "1" AFTER `id_address_delivery`'; $q_list['cart_product']['id_shop']['add'] = 'ALTER TABLE `'._DB_PREFIX_.'cart_product` - ADD `id_shop` `id_shop` int(10) unsigned NOT NULL DEFAULT "1" AFTER `id_address_delivery`'; + ADD `id_shop` int(10) unsigned NOT NULL DEFAULT "1" AFTER `id_address_delivery`'; $q_list['cart_product']['id_product_attribute']['mod'] = 'ALTER TABLE `'._DB_PREFIX_.'cart_product` CHANGE `id_product_attribute` `id_product_attribute` int(10) unsigned DEFAULT NULL AFTER `id_shop`'; $q_list['cart_product']['id_product_attribute']['add'] = 'ALTER TABLE `'._DB_PREFIX_.'cart_product` @@ -187,4 +187,4 @@ function p15012_add_missing_columns() } else return true; -} \ No newline at end of file +} diff --git a/install-dev/upgrade/sql/1.5.0.0.sql b/install-dev/upgrade/sql/1.5.0.0.sql index 04d5ec9e5..e38efa8fc 100755 --- a/install-dev/upgrade/sql/1.5.0.0.sql +++ b/install-dev/upgrade/sql/1.5.0.0.sql @@ -312,7 +312,8 @@ 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); -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`; +ALTER TABLE `PREFIX_delivery` ADD `id_shop` INT UNSIGNED NULL DEFAULT NULL AFTER `id_delivery`; +ALTER TABLE `PREFIX_delivery` ADD `id_group_shop` INT UNSIGNED NULL DEFAULT NULL AFTER `id_shop`; /* PHP:create_multistore(); */; diff --git a/install-dev/upgrade/sql/1.5.0.2.sql b/install-dev/upgrade/sql/1.5.0.2.sql old mode 100644 new mode 100755 index 9c7c239f7..e42871126 --- a/install-dev/upgrade/sql/1.5.0.2.sql +++ b/install-dev/upgrade/sql/1.5.0.2.sql @@ -411,7 +411,7 @@ ALTER TABLE `PREFIX_image_type` ADD `id_theme` INT(11) NOT NULL AFTER `id_image_ ALTER TABLE `PREFIX_image_type` ADD UNIQUE (`id_theme` ,`name`); UPDATE `PREFIX_image_type` SET `id_theme`=1; -CREATE TABLE `PREFIX_webservice_account_shop` ( +CREATE TABLE IF NOT EXISTS `PREFIX_webservice_account_shop` ( `id_webservice_account` INT( 11 ) UNSIGNED NOT NULL, `id_shop` INT( 11 ) UNSIGNED NOT NULL, PRIMARY KEY (`id_webservice_account` , `id_shop`),