// Fixed upgrade warnings #PSCFV-3633

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16910 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-08-20 10:28:09 +00:00
parent cccf6974d7
commit 53fefc8564
4 changed files with 21 additions and 23 deletions
+2 -2
View File
@@ -86,14 +86,14 @@ INSERT INTO `PREFIX_stock` (id_product, id_product_attribute, id_shop, quantity)
) FROM PREFIX_product p);
ALTER TABLE PREFIX_stock_mvt ADD id_stock INT UNSIGNED NOT NULL AFTER id_stock_mvt;
UPDATE PREFIX_stock_mvt sm SET sm.id_stock = (
UPDATE PREFIX_stock_mvt sm SET sm.id_stock = IFNULL((
SELECT IFNULL(s.id_stock, 0)
FROM PREFIX_stock s
WHERE s.id_product = sm.id_product
AND s.id_product_attribute = sm.id_product_attribute
ORDER BY s.id_shop
LIMIT 1
);
), 0);
DELETE FROM PREFIX_stock_mvt WHERE id_stock = 0;
ALTER TABLE PREFIX_stock_mvt DROP id_product, DROP id_product_attribute;
+1 -1
View File
@@ -245,7 +245,7 @@ CREATE TABLE `PREFIX_order_invoice` (
KEY `id_order` (`id_order`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
ALTER TABLE `PREFIX_order_detail` ADD `id_order_invoice` int(11) NULL AFTER `id_order`;
ALTER TABLE `PREFIX_order_detail` ADD `id_order_invoice` int(11) NOT NULL DEFAULT 0 AFTER `id_order`;
ALTER TABLE `PREFIX_payment_cc` CHANGE `id_payment_cc` `id_order_payment` INT NOT NULL auto_increment;
ALTER TABLE `PREFIX_payment_cc` ADD `id_order_invoice` varchar(255) NOT NULL AFTER `id_order_payment`;
+1 -2
View File
@@ -286,8 +286,7 @@ CREATE TABLE IF NOT EXISTS `PREFIX_stock_mvt` (
ALTER TABLE `PREFIX_orders` DROP COLUMN `id_warehouse`;
ALTER TABLE `PREFIX_supplier` ADD COLUMN `id_address` int(10) unsigned NOT NULL default '0' AFTER `id_supplier`;
ALTER TABLE `PREFIX_address` ADD COLUMN `id_warehouse` int(10) unsigned NOT NULL DEFAULT 0 AFTER `id_supplier`;
ALTER TABLE `PREFIX_order_detail`
ADD COLUMN `id_warehouse` int(10) unsigned NOT NULL default '0' AFTER `id_order_invoice`;
ALTER TABLE `PREFIX_order_detail` ADD COLUMN `id_warehouse` int(10) unsigned NOT NULL default '0' AFTER `id_order_invoice`;
ALTER TABLE `PREFIX_stock_mvt_reason` ADD COLUMN `deleted` tinyint(1) unsigned NOT NULL default '0' AFTER `date_upd`;