TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into template

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
This commit is contained in:
Manuel Raynaud
2013-09-16 10:19:40 +02:00
parent a4c8df366b 2468db3a00
commit 365d90b4a8
148 changed files with 18129 additions and 3349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
local/config/schema.xml
View File

@@ -28,15 +28,22 @@
<column name="description" type="CLOB" />
<column name="chapo" type="LONGVARCHAR" />
<column name="postscriptum" type="LONGVARCHAR" />
<column name="template_id" required="true" type="INTEGER" />
<foreign-key foreignTable="tax_rule" name="fk_product_tax_rule_id" onDelete="SET NULL" onUpdate="RESTRICT">
<reference foreign="id" local="tax_rule_id" />
</foreign-key>
<foreign-key foreignTable="template" name="fk_product_template1">
<reference foreign="id" local="template_id" />
</foreign-key>
<unique name="ref_UNIQUE">
<unique-column name="ref" />
</unique>
<index name="idx_product_tax_rule_id">
<index-column name="tax_rule_id" />
</index>
<index name="fk_product_template_id">
<index-column name="template_id" />
</index>
<behavior name="timestampable" />
<behavior name="i18n">
<parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -188,22 +195,22 @@
</index>
<behavior name="timestampable" />
</table>
<table isCrossRef="true" name="feature_category" namespace="Thelia\Model">
<table isCrossRef="true" name="feature_template" namespace="Thelia\Model">
<column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
<column name="feature_id" required="true" type="INTEGER" />
<column name="category_id" required="true" type="INTEGER" />
<foreign-key foreignTable="category" name="fk_feature_category_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
<reference foreign="id" local="category_id" />
</foreign-key>
<foreign-key foreignTable="feature" name="fk_feature_category_feature_id" onDelete="CASCADE" onUpdate="RESTRICT">
<column name="template_id" required="true" type="INTEGER" />
<foreign-key foreignTable="feature" name="fk_feature_template_id" onDelete="CASCADE" onUpdate="RESTRICT">
<reference foreign="id" local="feature_id" />
</foreign-key>
<index name="idx_feature_category_category_id">
<index-column name="category_id" />
</index>
<index name="idx_feature_category_feature_id">
<foreign-key foreignTable="template" name="fk_feature_template">
<reference foreign="id" local="template_id" />
</foreign-key>
<index name="idx_feature_template_id">
<index-column name="feature_id" />
</index>
<index name="fk_feature_template_idx">
<index-column name="template_id" />
</index>
<behavior name="timestampable" />
</table>
<table name="attribute" namespace="Thelia\Model">
@@ -280,22 +287,22 @@
</unique>
<behavior name="timestampable" />
</table>
<table isCrossRef="true" name="attribute_category" namespace="Thelia\Model">
<table isCrossRef="true" name="attribute_template" namespace="Thelia\Model">
<column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
<column name="category_id" required="true" type="INTEGER" />
<column name="attribute_id" required="true" type="INTEGER" />
<foreign-key foreignTable="category" name="fk_attribute_category_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
<reference foreign="id" local="category_id" />
</foreign-key>
<foreign-key foreignTable="attribute" name="fk_attribute_category_attribute_id" onDelete="CASCADE" onUpdate="RESTRICT">
<column name="template_id" required="true" type="INTEGER" />
<foreign-key foreignTable="attribute" name="fk_attribute_template_id" onDelete="CASCADE" onUpdate="RESTRICT">
<reference foreign="id" local="attribute_id" />
</foreign-key>
<index name="idx_attribute_category_category_id">
<index-column name="category_id" />
</index>
<index name="idx_attribute_category_attribute_id">
<foreign-key foreignTable="template" name="fk_attribute_template">
<reference foreign="id" local="template_id" />
</foreign-key>
<index name="idx_attribute_template_id">
<index-column name="attribute_id" />
</index>
<index name="fk_attribute_template_idx">
<index-column name="template_id" />
</index>
<behavior name="timestampable" />
</table>
<table name="config" namespace="Thelia\Model">
@@ -329,6 +336,8 @@
<column name="lang" size="10" type="VARCHAR" />
<column name="sponsor" size="50" type="VARCHAR" />
<column name="discount" type="FLOAT" />
<column name="remember_me_token" size="255" type="VARCHAR" />
<column name="remember_me_serial" size="255" type="VARCHAR" />
<foreign-key foreignTable="customer_title" name="fk_customer_customer_title_id" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference foreign="id" local="title_id" />
</foreign-key>
@@ -694,6 +703,8 @@
<column name="password" required="true" size="128" type="VARCHAR" />
<column name="algo" size="128" type="VARCHAR" />
<column name="salt" size="128" type="VARCHAR" />
<column name="remember_me_token" size="255" type="VARCHAR" />
<column name="remember_me_serial" size="255" type="VARCHAR" />
<behavior name="timestampable" />
</table>
<table isCrossRef="true" name="admin_group" namespace="Thelia\Model">
@@ -1141,4 +1152,12 @@
</index>
<behavior name="timestampable" />
</table>
<table name="template" namespace="Thelia\Model">
<column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
<column name="name" size="255" type="VARCHAR" />
<behavior name="i18n">
<parameter name="i18n_columns" value="name" />
</behavior>
<behavior name="timestampable" />
</table>
</database>