[-] Installer : changed the primary keys of tha language tables of category, product, meta, carrier #PSCFV-3726

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

install-dev/data/db_structure.sql

@@ -156,13 +156,13 @@ CREATE TABLE `PREFIX_carrier_lang` (
   `id_shop` int(11) unsigned NOT NULL DEFAULT '1',
   `id_lang` int(10) unsigned NOT NULL,
   `delay` varchar(128) DEFAULT NULL,
-  PRIMARY KEY `shipper_lang_index` (`id_lang`,`id_shop`, `id_carrier`)
+  PRIMARY KEY (`id_lang`,`id_shop`, `id_carrier`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_carrier_zone` (
   `id_carrier` int(10) unsigned NOT NULL,
   `id_zone` int(10) unsigned NOT NULL,
-  PRIMARY KEY `carrier_zone_index` (`id_carrier`,`id_zone`)
+  PRIMARY KEY (`id_carrier`,`id_zone`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_cart` (
@@ -331,7 +331,7 @@ CREATE TABLE `PREFIX_category` (
 CREATE TABLE `PREFIX_category_group` (
   `id_category` int(10) unsigned NOT NULL,
   `id_group` int(10) unsigned NOT NULL,
-  UNIQUE KEY `category_group_index` (`id_category`,`id_group`),
+  PRIMARY KEY (`id_category`,`id_group`),
   KEY `id_category` (`id_category`),
   KEY `id_group` (`id_group`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
@@ -346,7 +346,7 @@ CREATE TABLE `PREFIX_category_lang` (
   `meta_title` varchar(128) default NULL,
   `meta_keywords` varchar(255) default NULL,
   `meta_description` varchar(255) default NULL,
-  UNIQUE KEY `category_lang_index` (`id_category`,`id_shop`, `id_lang`),
+  PRIMARY KEY (`id_category`,`id_shop`, `id_lang`),
   KEY `category_name` (`name`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
@@ -489,7 +489,7 @@ CREATE TABLE `PREFIX_contact_lang` (
   `id_lang` int(10) unsigned NOT NULL,
   `name` varchar(32) NOT NULL,
   `description` text,
-  UNIQUE KEY `contact_lang_index` (`id_contact`,`id_lang`)
+  PRIMARY KEY (`id_contact`,`id_lang`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_country` (
@@ -513,7 +513,7 @@ CREATE TABLE `PREFIX_country_lang` (
   `id_country` int(10) unsigned NOT NULL,
   `id_lang` int(10) unsigned NOT NULL,
   `name` varchar(64) NOT NULL,
-  UNIQUE KEY `country_lang_index` (`id_country`,`id_lang`)
+  PRIMARY KEY (`id_country`,`id_lang`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_currency` (
@@ -574,7 +574,7 @@ CREATE TABLE `PREFIX_customer` (
 CREATE TABLE `PREFIX_customer_group` (
   `id_customer` int(10) unsigned NOT NULL,
   `id_group` int(10) unsigned NOT NULL,
-  PRIMARY KEY `customer_group_index` (`id_customer`,`id_group`),
+  PRIMARY KEY (`id_customer`,`id_group`),
   INDEX customer_login(id_group),
   KEY `id_customer` (`id_customer`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
@@ -784,7 +784,7 @@ CREATE TABLE `PREFIX_group_lang` (
   `id_group` int(10) unsigned NOT NULL,
   `id_lang` int(10) unsigned NOT NULL,
   `name` varchar(32) NOT NULL,
-  UNIQUE KEY `attribute_lang_index` (`id_group`,`id_lang`)
+  PRIMARY KEY (`id_group`,`id_lang`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_group_reduction` (
@@ -888,7 +888,7 @@ CREATE TABLE `PREFIX_image_lang` (
   `id_image` int(10) unsigned NOT NULL,
   `id_lang` int(10) unsigned NOT NULL,
   `legend` varchar(128) default NULL,
-  UNIQUE KEY `image_lang_index` (`id_image`,`id_lang`),
+  PRIMARY KEY (`id_image`,`id_lang`),
   KEY `id_image` (`id_image`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
@@ -1243,7 +1243,7 @@ CREATE TABLE `PREFIX_order_return_state_lang` (
   `id_order_return_state` int(10) unsigned NOT NULL,
   `id_lang` int(10) unsigned NOT NULL,
   `name` varchar(64) NOT NULL,
-  UNIQUE KEY `order_state_lang_index` (`id_order_return_state`,`id_lang`)
+  PRIMARY KEY (`id_order_return_state`,`id_lang`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_order_slip` (
@@ -1293,7 +1293,7 @@ CREATE TABLE `PREFIX_order_state_lang` (
   `id_lang` int(10) unsigned NOT NULL,
   `name` varchar(64) NOT NULL,
   `template` varchar(64) NOT NULL,
-  UNIQUE KEY `order_state_lang_index` (`id_order_state`,`id_lang`)
+  PRIMARY KEY (`id_order_state`,`id_lang`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_pack` (
@@ -1512,7 +1512,7 @@ CREATE TABLE `PREFIX_product_lang` (
   `name` varchar(128) NOT NULL,
   `available_now` varchar(255) default NULL,
   `available_later` varchar(255) default NULL,
-  UNIQUE KEY `product_lang_index` (`id_product`, `id_shop` , `id_lang`),
+  PRIMARY KEY (`id_product`, `id_shop` , `id_lang`),
   KEY `id_lang` (`id_lang`),
   KEY `name` (`name`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
@@ -1773,13 +1773,13 @@ CREATE TABLE `PREFIX_tax_lang` (
   `id_tax` int(10) unsigned NOT NULL,
   `id_lang` int(10) unsigned NOT NULL,
   `name` varchar(32) NOT NULL,
-  UNIQUE KEY `tax_lang_index` (`id_tax`,`id_lang`)
+  PRIMARY KEY (`id_tax`,`id_lang`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_timezone` (
 	id_timezone int(10) unsigned NOT NULL auto_increment,
 	name VARCHAR(32) NOT NULL,
-	PRIMARY KEY timezone_index(`id_timezone`)
+	PRIMARY KEY (`id_timezone`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_web_browser` (
@@ -1798,7 +1798,7 @@ CREATE TABLE `PREFIX_zone` (
 CREATE TABLE `PREFIX_carrier_group` (
   `id_carrier` int(10) unsigned NOT NULL,
   `id_group` int(10) unsigned NOT NULL,
-  UNIQUE KEY `id_carrier` (`id_carrier`,`id_group`)
+  PRIMARY KEY (`id_carrier`,`id_group`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_store` (
@@ -1866,7 +1866,7 @@ CREATE TABLE `PREFIX_product_country_tax` (
   `id_product` int(11) NOT NULL,
   `id_country` int(11) NOT NULL,
   `id_tax` int(11) NOT NULL,
-  UNIQUE KEY `id_product` (`id_product`,`id_country`)
+  PRIMARY KEY (`id_product`,`id_country`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 

install-dev/upgrade/php/add_id_shop_to_shipper_lang_index.php

@@ -28,16 +28,14 @@
 function add_id_shop_to_shipper_lang_index()
 {
 	$res = true;
-	$key_exists = Db::getInstance()->executeS('SHOW INDEX
+	
+	$key_exists = Db::getInstance()->executeS('
+	SHOW INDEX
 	FROM `'._DB_PREFIX_.'carrier_lang`
 	WHERE Key_name = "shipper_lang_index"');
 	if ($key_exists)
-		$res &= Db::getInstance()->execute('ALTER TABLE 
+		$res &= Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'carrier_lang` DROP KEY `shipper_lang_index`');
-		`'._DB_PREFIX_.'carrier_lang` 
+	$res &= Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'carrier_lang` ADD PRIMARY KEY (`id_carrier`, `id_shop`, `id_lang`)');
-		DROP KEY `shipper_lang_index`');
-	$res &= Db::getInstance()->execute('ALTER TABLE 
-	`'._DB_PREFIX_.'carrier_lang` 
-	ADD UNIQUE `shipper_lang_index` (`id_carrier`, `id_shop`, `id_lang`)');
 
 	return $res;
 }

install-dev/upgrade/sql/1.5.0.17.sql

@@ -6,3 +6,5 @@ ALTER TABLE `PREFIX_order_detail_tax` CHANGE `total_amount` `total_amount` DECIM
 ALTER TABLE `PREFIX_customer_message` ADD `read` tinyint(1) NOT NULL default '0' AFTER `private`;
 
 INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_ALLOW_MOBILE_DEVICE', '1', NOW(), NOW());
+
+/* PHP:p15017_add_id_shop_to_primary_key(); */;