dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] Installer : no more sql or php error when upgrade. ( @todo update_feature_detachable_cache )

Browse Source
This commit is contained in:
mMarinetti
2012-01-06 16:27:42 +00:00
parent dec32fcd31
commit 0c226b3e8d
10 changed files with 163 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/sql/upgrade/1.5.0.0.sql
+5 -1
View File
@@ -24,7 +24,11 @@ CREATE TABLE IF NOT EXISTS `PREFIX_shop` (
KEY `id_category` (`id_category`),
KEY `id_theme` (`id_theme`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
INSERT INTO `PREFIX_shop` (`id_shop`, `id_group_shop`, `name`, `id_category`, `active`) VALUES (1, 1, 'Default', 1, 1);
INSERT INTO `PREFIX_shop`
(`id_shop`, `id_group_shop`, `name`, `id_category`, `id_theme`, `active`, `deleted`)
VALUES
(1, 1, (SELECT value FROM `PREFIX_configuration` WHERE name = 'PS_SHOP_NAME'), 1, 1, 1, 0);
ALTER TABLE `PREFIX_configuration` ADD `id_group_shop` INT(11) UNSIGNED DEFAULT NULL AFTER `id_configuration` , ADD `id_shop` INT(11) UNSIGNED DEFAULT NULL AFTER `id_group_shop`;
ALTER TABLE `PREFIX_configuration` DROP INDEX `name` , ADD INDEX `name` ( `name` ) ;
install-dev/sql/upgrade/1.5.0.1.sql
+12 -3
View File
@@ -67,9 +67,18 @@ ALTER TABLE `PREFIX_tax_rule`
ALTER TABLE `PREFIX_tax_rule` DROP INDEX tax_rule;
INSERT INTO `PREFIX_tax_rule` (`id_tax_rules_group`, `id_country`, `id_state`, `id_tax`, `behavior`, `zipcode_from`, `zipcode_to`)
SELECT r.`id_tax_rules_group`, r.`id_country`, r.`id_state`, r.`id_tax`, 0, z.`from_zip_code`, z.`to_zip_code`
FROM `PREFIX_tax_rule` r INNER JOIN `PREFIX_county_zip_code` z ON (z.`id_county` = r.`id_county`);
INSERT INTO `PREFIX_tax_rule`
(`id_tax_rules_group`, `id_country`, `id_state`, `id_tax`,
`behavior`, `zipcode_from`, `zipcode_to`, `id_county`,
`description`, `state_behavior`, `county_behavior`)
SELECT r.`id_tax_rules_group`, r.`id_country`, r.`id_state`, r.`id_tax`,
0, z.`from_zip_code`, z.`to_zip_code`, r.`id_county`,
r.`description`, r.`state_behavior`, r.county_behavior
FROM
`PREFIX_tax_rule` r
INNER JOIN
`PREFIX_county_zip_code` z
ON (z.`id_county` = r.`id_county`);
UPDATE `PREFIX_tax_rule` SET `behavior` = GREATEST(`state_behavior`, `county_behavior`);
install-dev/sql/upgrade/1.5.0.2.sql
+15 -12
View File
@@ -381,16 +381,19 @@ INSERT INTO `PREFIX_order_carrier` (`id_order`, `id_carrier`, `id_order_invoice`
FROM `PREFIX_orders` o
);
INSERT INTO `PREFIX_order_payment` (`id_order_invoice`, `id_order`, `id_currency`, `amount`, `payment_method`, `conversion_rate`, `date_add`) (
SELECT (
SELECT oi.`id_order_invoice`
FROM `PREFIX_order_invoice` oi
WHERE oi.`id_order` = o.`id_order`
), o.`id_order`, o.`id_currency`, o.`total_paid_real`, o.`payment`, o.`conversion_rate`, o.`date_add`
FROM `PREFIX_orders` o
LEFT JOIN `PREFIX_order_payment` op ON (op.`id_order` = o.`id_order`)
WHERE op.`id_order_payment` IS NULL
);
INSERT IGNORE INTO `PREFIX_order_payment` (`id_order_invoice`, `id_order`, `id_currency`, `amount`, `payment_method`, `conversion_rate`, `date_add`)
(
SELECT
(
SELECT oi.`id_order_invoice`
FROM `PREFIX_order_invoice` oi
WHERE oi.`id_order` = o.`id_order`
),
o.`id_order`, o.`id_currency`, o.`total_paid_real`, o.`payment`, o.`conversion_rate`, o.`date_add`
FROM `PREFIX_orders` o
LEFT JOIN `PREFIX_order_payment` op ON (op.`id_order` = o.`id_order`)
WHERE op.`id_order_payment` IS NULL
);
INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES
('PS_SMARTY_CONSOLE', '0', NOW(), NOW()),('PS_INVOICE_MODEL', 'invoice', NOW(), NOW());
@@ -420,7 +423,7 @@ WHERE `class_name` = 'AdminAccounting';
ALTER TABLE `PREFIX_order_slip_detail` CHANGE `amount` `amount_tax_excl` DECIMAL( 10, 2 ) default NULL;
ALTER TABLE `PREFIX_order_slip_detail` ADD COLUMN `amount_tax_incl` DECIMAL(10,2) default NULL AFTER `amount_tax_excl`;
ALTER TABLE `PREFIX_image_type` DROP INDEX `name`;
/* PHP:drop_image_type_non_unique_index(); */;
ALTER TABLE `PREFIX_image_type` ADD `id_theme` INT(11) NOT NULL AFTER `id_image_type`;
ALTER TABLE `PREFIX_image_type` ADD UNIQUE (`id_theme` ,`name`);
UPDATE `PREFIX_image_type` SET `id_theme`=1;
@@ -432,4 +435,4 @@ PRIMARY KEY (`id_webservice_account` , `id_shop`),
KEY `id_shop` (`id_shop`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
ALTER TABLE `PREFIX_group` ADD `show_prices` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `price_display_method`;
ALTER TABLE `PREFIX_group` ADD `show_prices` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `price_display_method`;