From 0e5b90275281b7312816f73a013ed13043c2eedc Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 18 Oct 2013 13:57:24 +0200
Subject: [PATCH 1/3] hardcode utf8 parameters

---
 core/lib/Thelia/Config/DefinePropel.php |   4 +-
 install/thelia.sql                      | 196 ++++++++++++------------
 local/config/schema.xml                 |   7 +-
 3 files changed, 107 insertions(+), 100 deletions(-)

diff --git a/core/lib/Thelia/Config/DefinePropel.php b/core/lib/Thelia/Config/DefinePropel.php
index 3f7547fde..05a42a504 100755
--- a/core/lib/Thelia/Config/DefinePropel.php
+++ b/core/lib/Thelia/Config/DefinePropel.php
@@ -44,7 +44,9 @@ class DefinePropel
             "dsn" => $connection["dsn"],
             "user" => $connection["user"],
             "password" => $connection["password"],
-            "classname" => $connection["classname"]
+            "classname" => $connection["classname"],
+            'options' => array(
+                \PDO::MYSQL_ATTR_INIT_COMMAND => array('value' =>'SET NAMES \'UTF8\''))
         );
     }
 }
diff --git a/install/thelia.sql b/install/thelia.sql
index 4371aa4f5..c062681d1 100755
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -21,7 +21,7 @@ CREATE TABLE `category`
     `version_created_at` DATETIME,
     `version_created_by` VARCHAR(100),
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- product
@@ -54,7 +54,7 @@ CREATE TABLE `product`
     CONSTRAINT `fk_product_template`
         FOREIGN KEY (`template_id`)
         REFERENCES `template` (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- product_category
@@ -83,7 +83,7 @@ CREATE TABLE `product_category`
         REFERENCES `category` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- country
@@ -108,7 +108,7 @@ CREATE TABLE `country`
         REFERENCES `area` (`id`)
         ON UPDATE RESTRICT
         ON DELETE SET NULL
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- tax
@@ -124,7 +124,7 @@ CREATE TABLE `tax`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- tax_rule
@@ -139,7 +139,7 @@ CREATE TABLE `tax_rule`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- tax_rule_country
@@ -174,7 +174,7 @@ CREATE TABLE `tax_rule_country`
         REFERENCES `country` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- feature
@@ -190,7 +190,7 @@ CREATE TABLE `feature`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- feature_av
@@ -212,7 +212,7 @@ CREATE TABLE `feature_av`
         REFERENCES `feature` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- feature_product
@@ -249,7 +249,7 @@ CREATE TABLE `feature_product`
         REFERENCES `feature_av` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- feature_template
@@ -276,7 +276,7 @@ CREATE TABLE `feature_template`
     CONSTRAINT `fk_feature_template`
         FOREIGN KEY (`template_id`)
         REFERENCES `template` (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- attribute
@@ -291,7 +291,7 @@ CREATE TABLE `attribute`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- attribute_av
@@ -313,7 +313,7 @@ CREATE TABLE `attribute_av`
         REFERENCES `attribute` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- attribute_combination
@@ -347,7 +347,7 @@ CREATE TABLE `attribute_combination`
         REFERENCES `product_sale_elements` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- product_sale_elements
@@ -375,7 +375,7 @@ CREATE TABLE `product_sale_elements`
         REFERENCES `product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- attribute_template
@@ -402,7 +402,7 @@ CREATE TABLE `attribute_template`
     CONSTRAINT `fk_attribute_template`
         FOREIGN KEY (`template_id`)
         REFERENCES `template` (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- config
@@ -421,7 +421,7 @@ CREATE TABLE `config`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     UNIQUE INDEX `name_UNIQUE` (`name`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- customer
@@ -455,7 +455,7 @@ CREATE TABLE `customer`
         REFERENCES `customer_title` (`id`)
         ON UPDATE RESTRICT
         ON DELETE RESTRICT
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- address
@@ -502,7 +502,7 @@ CREATE TABLE `address`
         REFERENCES `country` (`id`)
         ON UPDATE RESTRICT
         ON DELETE RESTRICT
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- customer_title
@@ -518,7 +518,7 @@ CREATE TABLE `customer_title`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- lang
@@ -544,7 +544,7 @@ CREATE TABLE `lang`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- folder
@@ -564,7 +564,7 @@ CREATE TABLE `folder`
     `version_created_at` DATETIME,
     `version_created_by` VARCHAR(100),
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- content
@@ -583,7 +583,7 @@ CREATE TABLE `content`
     `version_created_at` DATETIME,
     `version_created_by` VARCHAR(100),
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- product_image
@@ -606,7 +606,7 @@ CREATE TABLE `product_image`
         REFERENCES `product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- product_document
@@ -629,7 +629,7 @@ CREATE TABLE `product_document`
         REFERENCES `product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- order
@@ -707,7 +707,7 @@ CREATE TABLE `order`
         REFERENCES `lang` (`id`)
         ON UPDATE RESTRICT
         ON DELETE RESTRICT
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- currency
@@ -726,7 +726,7 @@ CREATE TABLE `currency`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- order_address
@@ -751,7 +751,7 @@ CREATE TABLE `order_address`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- order_product
@@ -787,7 +787,7 @@ CREATE TABLE `order_product`
         REFERENCES `order` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- order_status
@@ -803,7 +803,7 @@ CREATE TABLE `order_status`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     UNIQUE INDEX `code_UNIQUE` (`code`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- order_product_attribute_combination
@@ -832,7 +832,7 @@ CREATE TABLE `order_product_attribute_combination`
         REFERENCES `order_product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- module
@@ -852,7 +852,7 @@ CREATE TABLE `module`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     UNIQUE INDEX `code_UNIQUE` (`code`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- accessory
@@ -881,7 +881,7 @@ CREATE TABLE `accessory`
         REFERENCES `product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- area
@@ -897,7 +897,7 @@ CREATE TABLE `area`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- area_delivery_module
@@ -926,7 +926,7 @@ CREATE TABLE `area_delivery_module`
         REFERENCES `module` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- group
@@ -942,7 +942,7 @@ CREATE TABLE `group`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     UNIQUE INDEX `code_UNIQUE` (`code`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- resource
@@ -958,7 +958,7 @@ CREATE TABLE `resource`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     UNIQUE INDEX `code_UNIQUE` (`code`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- admin
@@ -980,7 +980,7 @@ CREATE TABLE `admin`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- admin_group
@@ -1008,7 +1008,7 @@ CREATE TABLE `admin_group`
         REFERENCES `admin` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- group_resource
@@ -1038,7 +1038,7 @@ CREATE TABLE `group_resource`
         REFERENCES `resource` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- group_module
@@ -1067,7 +1067,7 @@ CREATE TABLE `group_module`
         REFERENCES `module` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- message
@@ -1087,7 +1087,7 @@ CREATE TABLE `message`
     `version_created_by` VARCHAR(100),
     PRIMARY KEY (`id`),
     UNIQUE INDEX `name_UNIQUE` (`name`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- coupon
@@ -1123,7 +1123,7 @@ CREATE TABLE `coupon`
     INDEX `idx_is_removing_postage` (`is_removing_postage`),
     INDEX `idx_max_usage` (`max_usage`),
     INDEX `idx_is_available_on_special_offers` (`is_available_on_special_offers`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- coupon_order
@@ -1145,7 +1145,7 @@ CREATE TABLE `coupon_order`
         REFERENCES `order` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- admin_log
@@ -1164,7 +1164,7 @@ CREATE TABLE `admin_log`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- content_folder
@@ -1193,7 +1193,7 @@ CREATE TABLE `content_folder`
         REFERENCES `folder` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- cart
@@ -1230,7 +1230,7 @@ CREATE TABLE `cart`
     CONSTRAINT `fk_cart_currency_id`
         FOREIGN KEY (`currency_id`)
         REFERENCES `currency` (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- cart_item
@@ -1265,7 +1265,7 @@ CREATE TABLE `cart_item`
     CONSTRAINT `fk_cart_item_product_sale_elements_id`
         FOREIGN KEY (`product_sale_elements_id`)
         REFERENCES `product_sale_elements` (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- product_price
@@ -1292,7 +1292,7 @@ CREATE TABLE `product_price`
         FOREIGN KEY (`currency_id`)
         REFERENCES `currency` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- category_image
@@ -1315,7 +1315,7 @@ CREATE TABLE `category_image`
         REFERENCES `category` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- folder_image
@@ -1338,7 +1338,7 @@ CREATE TABLE `folder_image`
         REFERENCES `folder` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- content_image
@@ -1361,7 +1361,7 @@ CREATE TABLE `content_image`
         REFERENCES `content` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- category_document
@@ -1384,7 +1384,7 @@ CREATE TABLE `category_document`
         REFERENCES `category` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- content_document
@@ -1407,7 +1407,7 @@ CREATE TABLE `content_document`
         REFERENCES `content` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- folder_document
@@ -1430,7 +1430,7 @@ CREATE TABLE `folder_document`
         REFERENCES `folder` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- product_associated_content
@@ -1459,7 +1459,7 @@ CREATE TABLE `product_associated_content`
         REFERENCES `content` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- category_associated_content
@@ -1488,7 +1488,7 @@ CREATE TABLE `category_associated_content`
         REFERENCES `content` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- rewriting_url
@@ -1515,7 +1515,7 @@ CREATE TABLE `rewriting_url`
         REFERENCES `rewriting_url` (`id`)
         ON UPDATE RESTRICT
         ON DELETE RESTRICT
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- rewriting_argument
@@ -1537,7 +1537,7 @@ CREATE TABLE `rewriting_argument`
         REFERENCES `rewriting_url` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- template
@@ -1551,7 +1551,7 @@ CREATE TABLE `template`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- module_image
@@ -1574,7 +1574,7 @@ CREATE TABLE `module_image`
         REFERENCES `module` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- order_product_tax
@@ -1599,7 +1599,7 @@ CREATE TABLE `order_product_tax`
         REFERENCES `order_product` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- category_i18n
@@ -1620,7 +1620,7 @@ CREATE TABLE `category_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `category` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- product_i18n
@@ -1641,7 +1641,7 @@ CREATE TABLE `product_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `product` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- country_i18n
@@ -1662,7 +1662,7 @@ CREATE TABLE `country_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `country` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- tax_i18n
@@ -1681,7 +1681,7 @@ CREATE TABLE `tax_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `tax` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- tax_rule_i18n
@@ -1700,7 +1700,7 @@ CREATE TABLE `tax_rule_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `tax_rule` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- feature_i18n
@@ -1721,7 +1721,7 @@ CREATE TABLE `feature_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `feature` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- feature_av_i18n
@@ -1742,7 +1742,7 @@ CREATE TABLE `feature_av_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `feature_av` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- attribute_i18n
@@ -1763,7 +1763,7 @@ CREATE TABLE `attribute_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `attribute` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- attribute_av_i18n
@@ -1784,7 +1784,7 @@ CREATE TABLE `attribute_av_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `attribute_av` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- config_i18n
@@ -1805,7 +1805,7 @@ CREATE TABLE `config_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `config` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- customer_title_i18n
@@ -1824,7 +1824,7 @@ CREATE TABLE `customer_title_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `customer_title` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- folder_i18n
@@ -1845,7 +1845,7 @@ CREATE TABLE `folder_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `folder` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- content_i18n
@@ -1866,7 +1866,7 @@ CREATE TABLE `content_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `content` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- product_image_i18n
@@ -1887,7 +1887,7 @@ CREATE TABLE `product_image_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `product_image` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- product_document_i18n
@@ -1908,7 +1908,7 @@ CREATE TABLE `product_document_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `product_document` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- currency_i18n
@@ -1926,7 +1926,7 @@ CREATE TABLE `currency_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `currency` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- order_status_i18n
@@ -1947,7 +1947,7 @@ CREATE TABLE `order_status_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `order_status` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- module_i18n
@@ -1968,7 +1968,7 @@ CREATE TABLE `module_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `module` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- group_i18n
@@ -1989,7 +1989,7 @@ CREATE TABLE `group_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `group` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- resource_i18n
@@ -2010,7 +2010,7 @@ CREATE TABLE `resource_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `resource` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- message_i18n
@@ -2031,7 +2031,7 @@ CREATE TABLE `message_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `message` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- coupon_i18n
@@ -2051,7 +2051,7 @@ CREATE TABLE `coupon_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `coupon` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- category_image_i18n
@@ -2072,7 +2072,7 @@ CREATE TABLE `category_image_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `category_image` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- folder_image_i18n
@@ -2093,7 +2093,7 @@ CREATE TABLE `folder_image_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `folder_image` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- content_image_i18n
@@ -2114,7 +2114,7 @@ CREATE TABLE `content_image_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `content_image` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- category_document_i18n
@@ -2135,7 +2135,7 @@ CREATE TABLE `category_document_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `category_document` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- content_document_i18n
@@ -2156,7 +2156,7 @@ CREATE TABLE `content_document_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `content_document` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- folder_document_i18n
@@ -2177,7 +2177,7 @@ CREATE TABLE `folder_document_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `folder_document` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- template_i18n
@@ -2195,7 +2195,7 @@ CREATE TABLE `template_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `template` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- module_image_i18n
@@ -2216,7 +2216,7 @@ CREATE TABLE `module_image_i18n`
         FOREIGN KEY (`id`)
         REFERENCES `module_image` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- category_version
@@ -2240,7 +2240,7 @@ CREATE TABLE `category_version`
         FOREIGN KEY (`id`)
         REFERENCES `category` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- product_version
@@ -2266,7 +2266,7 @@ CREATE TABLE `product_version`
         FOREIGN KEY (`id`)
         REFERENCES `product` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- folder_version
@@ -2290,7 +2290,7 @@ CREATE TABLE `folder_version`
         FOREIGN KEY (`id`)
         REFERENCES `folder` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- content_version
@@ -2313,7 +2313,7 @@ CREATE TABLE `content_version`
         FOREIGN KEY (`id`)
         REFERENCES `content` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- message_version
@@ -2336,7 +2336,7 @@ CREATE TABLE `message_version`
         FOREIGN KEY (`id`)
         REFERENCES `message` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 -- ---------------------------------------------------------------------
 -- coupon_version
@@ -2366,7 +2366,7 @@ CREATE TABLE `coupon_version`
         FOREIGN KEY (`id`)
         REFERENCES `coupon` (`id`)
         ON DELETE CASCADE
-) ENGINE=InnoDB;
+) ENGINE=InnoDB CHARACTER SET='utf8' COLLATE='utf8_general_ci';
 
 # This restores the fkey checks, after having unset them earlier
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/local/config/schema.xml b/local/config/schema.xml
index 65928176e..04ae32873 100755
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <database defaultIdMethod="native" name="thelia">
+    <vendor type="mysql">
+        <parameter name="Engine" value="InnoDB"/>
+        <parameter name="Charset" value="utf8"/>
+        <parameter name="Collate" value="utf8_general_ci"/>
+    </vendor>
   <table name="category" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="parent" type="INTEGER" />

From 0d242a4fc030c12a9027486c930ed5ac5122f021 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Tue, 22 Oct 2013 16:53:40 +0200
Subject: [PATCH 2/3] fix auth loop on index

---
 templates/default/layout.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 22e8cb5a5..fcbe4a840 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -67,7 +67,7 @@ URL: http://www.thelia.net
             <nav class="navbar-collapse collapse nav-main" role="navigation" aria-label="{intl l="Main Navigation"}">
                 {nocache}
                 <ul class="nav navbar-nav navbar-cart navbar-right">
-                    {loop type="auth" name="customer_info_block" roles="CUSTOMER" context="front"}
+                    {loop type="auth" name="customer_info_block" role="CUSTOMER" context="front"}
                         <li><a href="{url path="/logout"}" class="logout">{intl l="Log out!"}</a></li>
                         <li><a href="{url path="/account"}" class="account">{intl l="My Account"}</a></li>
                     {/loop}

From 0580539ed805d56d5c52fdcb902f3451005d10ea Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 22 Oct 2013 17:19:16 +0200
Subject: [PATCH 3/3] fix cart quantity for issue #46

---
 core/lib/Thelia/Action/Cart.php               |  3 ++-
 .../Controller/Front/CartController.php       |  2 +-
 core/lib/Thelia/Model/CartItem.php            | 23 ++++++++++++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/core/lib/Thelia/Action/Cart.php b/core/lib/Thelia/Action/Cart.php
index 89be6ea0a..f02030c8b 100755
--- a/core/lib/Thelia/Action/Cart.php
+++ b/core/lib/Thelia/Action/Cart.php
@@ -69,7 +69,8 @@ class Cart extends BaseAction implements EventSubscriberInterface
         }
 
         if ($append && $cartItem !== null) {
-            $this->updateQuantity($cartItem, $quantity);
+            $cartItem->addQuantity($quantity)
+                ->save();
         }
     }
 
diff --git a/core/lib/Thelia/Controller/Front/CartController.php b/core/lib/Thelia/Controller/Front/CartController.php
index ae116b40a..1b0d96003 100755
--- a/core/lib/Thelia/Controller/Front/CartController.php
+++ b/core/lib/Thelia/Controller/Front/CartController.php
@@ -74,7 +74,7 @@ class CartController extends BaseFrontController
         $cartEvent->setQuantity($this->getRequest()->get("quantity"));
 
         try {
-            $this->getDispatcher()->dispatch(TheliaEvents::CART_UPDATEITEM, $cartEvent);
+            $this->dispatch(TheliaEvents::CART_UPDATEITEM, $cartEvent);
 
             $this->redirectSuccess();
         } catch (PropelException $e) {
diff --git a/core/lib/Thelia/Model/CartItem.php b/core/lib/Thelia/Model/CartItem.php
index 427e7e735..5432bd1ab 100755
--- a/core/lib/Thelia/Model/CartItem.php
+++ b/core/lib/Thelia/Model/CartItem.php
@@ -60,14 +60,31 @@ class CartItem extends BaseCartItem
             }
         }
 
-        $this->addQuantity($value);
+        $this->setQuantity($value);
 
         return $this;
     }
 
-    public function addQuantity($quantity)
+    public function addQuantity($value)
     {
-        $this->setQuantity($this->getQuantity() + $quantity);
+        $currentQuantity = $this->getQuantity();
+        $newQuantity = $currentQuantity + $value;
+
+        if($value <= 0)
+        {
+            $value = $currentQuantity;
+        }
+
+        if(ConfigQuery::read("verifyStock", 1) == 1)
+        {
+            $productSaleElements = $this->getProductSaleElements();
+
+            if($productSaleElements->getQuantity() < $newQuantity) {
+                $newQuantity = $currentQuantity;
+            }
+        }
+
+        $this->setQuantity($newQuantity);
 
         return $this;
     }