// fix related to sql queries

2012-01-18 17:56:16 +00:00
parent d041dded26
commit c393edbd5b
5 changed files with 74 additions and 5 deletions
@@ -279,6 +279,7 @@ ALTER TABLE `PREFIX_module_group` DROP PRIMARY KEY;
 ALTER TABLE `PREFIX_module_group` ADD PRIMARY KEY (`id_module`, `id_shop`, `id_group`);

 ALTER TABLE `PREFIX_carrier_lang` ADD `id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1' AFTER `id_carrier`;
+ALTER TABLE `PREFIX_carrier_lang` DROP KEY `shipper_lang_index`;
 ALTER TABLE `PREFIX_carrier_lang` ADD UNIQUE `shipper_lang_index` (`id_carrier`, `id_shop`, `id_lang`);

 ALTER TABLE `PREFIX_search_word` ADD `id_shop` INT(11) NOT NULL DEFAULT '1' AFTER `id_word`;
@@ -65,8 +65,6 @@ ALTER TABLE `PREFIX_tax_rule`
 	ADD `behavior` INT NOT NULL AFTER `zipcode_to`,
 	ADD `description` VARCHAR( 100 ) NOT NULL AFTER `id_tax`;

-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`, `id_county`, 
@@ -531,7 +529,7 @@ ALTER TABLE `PREFIX_specific_price` DROP INDEX `id_product`;
 ALTER TABLE `PREFIX_specific_price` ADD INDEX `id_product` (`id_product`, `id_product_attribute`, `id_shop`, `id_currency`, `id_country`, `id_group`, `from_quantity`, `from`, `to`);


-ALTER TABLE `PREFIX_orders` ADD COLUMN `reference` varchar(9) AFTER `id_order`;
+/* PHP:add_column_orders_reference_if_not_exists(); */;
 ALTER TABLE `PREFIX_orders` ADD COLUMN `id_warehouse` int(10) unsigned DEFAULT 0 AFTER `id_carrier`;

 ALTER TABLE `PREFIX_cart` ADD COLUMN `order_reference` varchar(9) AFTER `id_cart`;
@@ -1,7 +1,6 @@
 SET NAMES 'utf8';

-
-ALTER TABLE `PREFIX_order_state` ADD COLUMN `deleted` tinyint(1) UNSIGNED NOT NULL default '0' AFTER `paid`;
+/* PHP:add_column_order_state_deleted_if_not_exists(); */;

 ALTER TABLE `PREFIX_category` ADD COLUMN `is_root_category` tinyint(1) NOT NULL default '0' AFTER `position`;