From a628c7cbca9d5f2731c7699f12553ca8dbd686ce Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Tue, 17 Apr 2012 16:46:26 +0000
Subject: [PATCH] // Fix position for category_product in installer

---
 install-dev/classes/xmlLoader.php             |  2 +-
 install-dev/data/xml/category.xml             |  2 +-
 install-dev/fixtures/apple/data/category.xml  |  2 +-
 .../fixtures/apple/data/category_product.xml  | 23 ++++++++++---------
 install-dev/fixtures/apple/data/product.xml   | 14 +++++------
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/install-dev/classes/xmlLoader.php b/install-dev/classes/xmlLoader.php
index d2a9bf908..77f44a915 100644
--- a/install-dev/classes/xmlLoader.php
+++ b/install-dev/classes/xmlLoader.php
@@ -691,7 +691,7 @@ class InstallXmlLoader
 				$columns[$table][$row['Field']] = $this->checkIfTypeIsText($row['Type']);
 		}
 
-		$exclude = array_merge(array('id_'.$table, 'date_add', 'date_upd', 'position', 'deleted', 'id_lang'), $exclude);
+		$exclude = array_merge(array('id_'.$table, 'date_add', 'date_upd', 'deleted', 'id_lang'), $exclude);
 
 		$list = array();
 		foreach ($columns[$table] as $k => $v)
diff --git a/install-dev/data/xml/category.xml b/install-dev/data/xml/category.xml
index 45845ae0f..fb8b55eed 100644
--- a/install-dev/data/xml/category.xml
+++ b/install-dev/data/xml/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_category>
-  <fields id="name" class="Category" sql="a.id_category = 1">
+  <fields id="name" class="Category" sql="a.id_category &lt;= 2">
     <field name="id_parent" relation="category"/>
     <field name="active"/>
   </fields>
diff --git a/install-dev/fixtures/apple/data/category.xml b/install-dev/fixtures/apple/data/category.xml
index 2eb06c28c..cb88a2047 100644
--- a/install-dev/fixtures/apple/data/category.xml
+++ b/install-dev/fixtures/apple/data/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_category>
-  <fields id="name" class="Category" sql="a.id_category &gt; 1" image="c">
+  <fields id="name" class="Category" sql="a.id_category &gt; 2" image="c">
     <field name="id_parent" relation="category"/>
     <field name="active"/>
   </fields>
diff --git a/install-dev/fixtures/apple/data/category_product.xml b/install-dev/fixtures/apple/data/category_product.xml
index 61fa8c812..01617d81f 100644
--- a/install-dev/fixtures/apple/data/category_product.xml
+++ b/install-dev/fixtures/apple/data/category_product.xml
@@ -3,18 +3,19 @@
   <fields primary="id_category, id_product">
     <field name="id_category" relation="category"/>
     <field name="id_product" relation="product"/>
+    <field name="position"/>
   </fields>
   <entities>
-    <category_product id="category_product_1_1" id_category="Home" id_product="iPod_Nano"/>
-    <category_product id="category_product_1_2" id_category="Home" id_product="iPod_shuffle"/>
-    <category_product id="category_product_1_6" id_category="Home" id_product="MacBook"/>
-    <category_product id="category_product_1_7" id_category="Home" id_product="iPod_touch"/>
-    <category_product id="category_product_2_1" id_category="iPods" id_product="iPod_Nano"/>
-    <category_product id="category_product_2_2" id_category="iPods" id_product="iPod_shuffle"/>
-    <category_product id="category_product_2_7" id_category="iPods" id_product="iPod_touch"/>
-    <category_product id="category_product_3_8" id_category="Accessories" id_product="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate"/>
-    <category_product id="category_product_3_9" id_category="Accessories" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone"/>
-    <category_product id="category_product_4_5" id_category="Laptops" id_product="MacBook_Air"/>
-    <category_product id="category_product_4_6" id_category="Laptops" id_product="MacBook"/>
+    <category_product id="category_product_2_1" id_category="Home" id_product="iPod_Nano" position="1"/>
+    <category_product id="category_product_2_2" id_category="Home" id_product="iPod_shuffle" position="2"/>
+    <category_product id="category_product_2_4" id_category="Home" id_product="MacBook" position="3"/>
+    <category_product id="category_product_2_5" id_category="Home" id_product="iPod_touch" position="4"/>
+    <category_product id="category_product_3_1" id_category="iPods" id_product="iPod_Nano" position="1"/>
+    <category_product id="category_product_3_2" id_category="iPods" id_product="iPod_shuffle" position="2"/>
+    <category_product id="category_product_3_5" id_category="iPods" id_product="iPod_touch" position="3"/>
+    <category_product id="category_product_4_6" id_category="Accessories" id_product="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" position="1"/>
+    <category_product id="category_product_4_7" id_category="Accessories" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" position="2"/>
+    <category_product id="category_product_5_3" id_category="Laptops" id_product="MacBook_Air" position="1"/>
+    <category_product id="category_product_5_4" id_category="Laptops" id_product="MacBook" position="2"/>
   </entities>
 </entity_category_product>
diff --git a/install-dev/fixtures/apple/data/product.xml b/install-dev/fixtures/apple/data/product.xml
index d8c483433..227202823 100644
--- a/install-dev/fixtures/apple/data/product.xml
+++ b/install-dev/fixtures/apple/data/product.xml
@@ -41,31 +41,31 @@
     <field name="advanced_stock_management"/>
   </fields>
   <entities>
-    <product id="iPod_Nano" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="70.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0.5" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
+    <product id="iPod_Nano" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="70.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0.5" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
       <unity/>
       <location/>
     </product>
-    <product id="iPod_shuffle" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="66.053500" wholesale_price="33.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
+    <product id="iPod_shuffle" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="66.053500" wholesale_price="33.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
       <unity/>
       <location/>
     </product>
-    <product id="MacBook_Air" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1504.180602" wholesale_price="1000.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="1.36" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
+    <product id="MacBook_Air" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1504.180602" wholesale_price="1000.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="1.36" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
       <unity/>
       <location/>
     </product>
-    <product id="MacBook" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1170.568561" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0.75" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
+    <product id="MacBook" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1170.568561" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0.75" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
       <unity/>
       <location/>
     </product>
-    <product id="iPod_touch" id_supplier="" id_manufacturer="" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="241.638796" wholesale_price="200.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
+    <product id="iPod_touch" id_supplier="" id_manufacturer="" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="241.638796" wholesale_price="200.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
       <unity/>
       <location/>
     </product>
-    <product id="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_supplier="" id_manufacturer="" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="25.041806" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
+    <product id="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_supplier="" id_manufacturer="" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="25.041806" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
       <unity/>
       <location/>
     </product>
-    <product id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_supplier="Shure_Online_Store" id_manufacturer="Shure_Incorporated" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
+    <product id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_supplier="Shure_Online_Store" id_manufacturer="Shure_Incorporated" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="0" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0">
       <unity/>
       <location/>
     </product>