From dedc59f1db1f3745211f32e57ab07b47bb7bc821 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 23 Sep 2013 15:10:44 +0200 Subject: [PATCH] [-] IN : FIX #PSCFV-10246 errors in stricts sql-mode, thanks @enumag --- install-dev/upgrade/php/p15012_add_missing_columns.php | 3 +++ install-dev/upgrade/sql/1.5.0.2.sql | 4 ++-- install-dev/upgrade/sql/1.5.0.6.sql | 4 ++-- install-dev/upgrade/sql/1.5.1.0.sql | 2 +- install-dev/upgrade/sql/1.5.3.0.sql | 2 +- install-dev/upgrade/sql/1.5.3.1.sql | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/install-dev/upgrade/php/p15012_add_missing_columns.php b/install-dev/upgrade/php/p15012_add_missing_columns.php index 21dce2f94..66977b3b1 100755 --- a/install-dev/upgrade/php/p15012_add_missing_columns.php +++ b/install-dev/upgrade/php/p15012_add_missing_columns.php @@ -111,6 +111,9 @@ function p15012_add_missing_columns() $q_list['order_invoice']['note']['mod'] = 'ALTER TABLE `'._DB_PREFIX_.'order_invoice` CHANGE `note` note text'; + $q_list['order_payment']['id_order_payment']['mod'] = 'UPDATE `'._DB_PREFIX_.'order_payment` + SET `id_order_invoice` = 0 WHERE `id_order_invoice` LIKE "" OR `id_order_invoice` IS NULL'; + $q_list['order_payment']['id_order_invoice']['mod'] = 'ALTER TABLE `'._DB_PREFIX_.'order_payment` CHANGE `id_order_invoice` id_order_invoice int(10) unsigned DEFAULT NULL'; diff --git a/install-dev/upgrade/sql/1.5.0.2.sql b/install-dev/upgrade/sql/1.5.0.2.sql index e42871126..0d7ec1a63 100755 --- a/install-dev/upgrade/sql/1.5.0.2.sql +++ b/install-dev/upgrade/sql/1.5.0.2.sql @@ -345,11 +345,11 @@ INSERT INTO `PREFIX_order_invoice` (`id_order`, `number`, `total_discount_tax_ex ALTER TABLE `PREFIX_tab` ADD `active` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1'; UPDATE `PREFIX_order_detail` od -SET od.`id_order_invoice` = ( +SET od.`id_order_invoice` = IFNULL(( SELECT oi.`id_order_invoice` FROM `PREFIX_order_invoice` oi WHERE oi.`id_order` = od.`id_order` -); +), 0); INSERT INTO `PREFIX_order_carrier` (`id_order`, `id_carrier`, `id_order_invoice`, `weight`, `shipping_cost_tax_excl`, `shipping_cost_tax_incl`, `tracking_number`, `date_add`) ( SELECT `id_order`, `id_carrier`, ( diff --git a/install-dev/upgrade/sql/1.5.0.6.sql b/install-dev/upgrade/sql/1.5.0.6.sql index f03bc0be2..29bcb05b7 100644 --- a/install-dev/upgrade/sql/1.5.0.6.sql +++ b/install-dev/upgrade/sql/1.5.0.6.sql @@ -1,11 +1,11 @@ SET NAMES 'utf8'; UPDATE `PREFIX_orders` o -SET o.`current_state` = ( +SET o.`current_state` = IFNULL(( SELECT oh.`id_order_state` FROM `PREFIX_order_history` oh WHERE oh.`id_order` = o.`id_order` ORDER BY oh.`date_add` DESC LIMIT 1 -); +), 0); diff --git a/install-dev/upgrade/sql/1.5.1.0.sql b/install-dev/upgrade/sql/1.5.1.0.sql index b365cf584..035ef027d 100644 --- a/install-dev/upgrade/sql/1.5.1.0.sql +++ b/install-dev/upgrade/sql/1.5.1.0.sql @@ -12,7 +12,7 @@ INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALU ALTER TABLE `PREFIX_product` CHANGE `width` `width` DECIMAL(20, 6) NOT NULL DEFAULT '0', CHANGE `height` `height` DECIMAL(20, 6) NOT NULL DEFAULT '0', CHANGE `depth` `depth` DECIMAL(20, 6) NOT NULL DEFAULT '0', CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0'; ALTER TABLE `PREFIX_product_attribute` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0'; ALTER TABLE `PREFIX_product_attribute_shop` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0'; -ALTER TABLE `PREFIX_order_carrier` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0'; +ALTER IGNORE TABLE `PREFIX_order_carrier` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0'; ALTER TABLE `PREFIX_attribute_impact` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0'; ALTER TABLE `PREFIX_order_detail` CHANGE `product_weight` `product_weight` DECIMAL(20, 6) NOT NULL DEFAULT '0'; ALTER TABLE `PREFIX_stock_available` DROP INDEX `product_sqlstock`; diff --git a/install-dev/upgrade/sql/1.5.3.0.sql b/install-dev/upgrade/sql/1.5.3.0.sql index abc00ff4a..2f8108f90 100644 --- a/install-dev/upgrade/sql/1.5.3.0.sql +++ b/install-dev/upgrade/sql/1.5.3.0.sql @@ -24,7 +24,7 @@ INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALU ALTER TABLE `PREFIX_order_cart_rule` CHANGE `name` `name` VARCHAR(254); -ALTER TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; +ALTER IGNORE TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; ALTER TABLE `PREFIX_currency_shop` ADD `conversion_rate` DECIMAL( 13, 6 ) NOT NULL; UPDATE `PREFIX_currency_shop` a SET `conversion_rate` = (SELECT `conversion_rate` FROM `PREFIX_currency` b WHERE a.id_currency = b.id_currency); diff --git a/install-dev/upgrade/sql/1.5.3.1.sql b/install-dev/upgrade/sql/1.5.3.1.sql index 381567a73..4146e75a1 100644 --- a/install-dev/upgrade/sql/1.5.3.1.sql +++ b/install-dev/upgrade/sql/1.5.3.1.sql @@ -2,4 +2,4 @@ SET NAMES 'utf8'; /* PHP:p1531_redirect_type(); */; -ALTER TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT NOT NULL; +ALTER IGNORE TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT NOT NULL;