// report 1.4.x sql files into 1.5 branch

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12523 b9a71923-0436-4b27-9f14-aed3839534dd

install-new/upgrade/sql/1.4.5.0.sql

@@ -36,7 +36,7 @@ INSERT INTO `PREFIX_hook` (`name`, `title`, `description`, `position`, `live_edi
 ('afterDeleteAttribute', 'On deleting attribute feature value', 'On deleting attribute feature value', 0, 0),
 ('afterSaveAttribute', 'On saving attribute feature value', 'On saving attribute feature value', 0, 0);
 
-ALTER TABLE `PREFIX_employee` ADD `bo_show_screencast` TINYINT(1) NOT NULL DEFAULT '1' AFTER `bo_theme`;
+ALTER TABLE `PREFIX_employee` ADD `bo_show_screencast` TINYINT(1) NOT NULL DEFAULT '1' AFTER `bo_uimode`;
 
 UPDATE `PREFIX_country` SET id_zone = (SELECT id_zone FROM `PREFIX_zone` WHERE name = 'Oceania' LIMIT 1) WHERE iso_code = 'KI' LIMIT 1;
 

install-new/upgrade/sql/1.4.6.1.sql

@@ -0,0 +1,3 @@
+SET NAMES 'utf8';
+
+/* PHP:add_module_to_hook(authorizeaim, header); */;

install-new/upgrade/sql/1.4.6.2.sql

@@ -0,0 +1,5 @@
+SET NAMES 'utf8';
+
+INSERT IGNORE INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES
+('PS_LIMIT_UPLOAD_IMAGE_VALUE', '2', NOW(), NOW()),
+('PS_LIMIT_UPLOAD_FILE_VALUE', '2', NOW(), NOW());

install-new/upgrade/sql/1.4.7.0.sql

@@ -0,0 +1,23 @@
+SET NAMES 'utf8';
+
+ALTER TABLE `PREFIX_category_product` DROP INDEX `category_product_index`;
+ALTER TABLE `PREFIX_category_product` ADD UNIQUE `category_product_index` (`id_category`,`id_product`);
+
+
+CREATE TABLE IF NOT EXISTS `PREFIX_order_tax` (
+  `id_order` int(11) NOT NULL,
+  `tax_name` varchar(40) NOT NULL,
+  `tax_rate` decimal(6,3) NOT NULL,
+  `amount` decimal(20,6) NOT NULL
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+
+INSERT INTO `PREFIX_hook` (`name`, `title`, `description`, `position`, `live_edit`) VALUES
+('frontCanonicalRedirect', 'Front Canonical Redirect', 'Check for 404 errors before canonical redirects', 0, 0);
+
+SET @id_hook = (SELECT `id_hook` FROM `PREFIX_hook` WHERE `name` = 'frontCanonicalRedirect');
+SET @position = (SELECT IFNULL(MAX(`position`),0)+1 FROM `PREFIX_hook_module` WHERE `id_hook` = @id_hook);
+SET @id_module = (SELECT `id_module` FROM `PREFIX_module` WHERE `name` = 'pagesnotfound');
+
+INSERT INTO `PREFIX_hook_module` (`id_hook`, `id_module`, `position`) VALUES (@id_hook, @id_module, @position);
+
+ALTER TABLE `PREFIX_order_state` ADD COLUMN `deleted` tinyint(1) UNSIGNED NOT NULL default '0' AFTER `delivery`;