// fix upgrade problems #PSCFV-2457 #PSCFV-2462 #PSCFV-1225

// (also reverted upgrade modifications from rev. 14682 15127 15129 15134 15165)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15465 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2012-05-20 10:10:21 +00:00
parent fee3790ffd
commit 2cf309cd35
11 changed files with 137 additions and 29 deletions
+3 -3
View File
@@ -1,14 +1,14 @@
SET NAMES 'utf8';
ALTER TABLE `PREFIX_cart_rule` ADD `shop_restriction` tinyint(1) unsigned NOT NULL default 0 AFTER `product_restriction`;
CREATE TABLE `PREFIX_cart_rule_shop` (
`id_cart_rule` int(10) unsigned NOT NULL,
`id_shop` int(10) unsigned NOT NULL,
PRIMARY KEY (`id_cart_rule`, `id_shop`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
INSERT INTO `PREFIX_configuration`(`id_shop_group`, `id_shop`, `name`, `value`, `date_add`, `date_upd`)
INSERT INTO `PREFIX_configuration`(`id_group_shop`, `id_shop`, `name`, `value`, `date_add`, `date_upd`)
VALUES
(NULL, NULL, 'PS_LOGO', 'logo.jpg', NOw(), NOW()),
(NULL, NULL, 'PS_LOGO_MAIL', 'logo_mail.jpg', NOw(), NOW()),
@@ -26,4 +26,4 @@ CREATE TABLE `PREFIX_module_preference` (
UNIQUE KEY `employee_module` (`id_employee`, `module`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
ALTER TABLE `PREFIX_category_shop` ADD `position` int(10) unsigned NOT NULL default 0 AFTER `id_shop`;
ALTER TABLE `PREFIX_category_shop` ADD `position` int(10) unsigned NOT NULL default 0 AFTER `id_shop`;