Merge on master
This commit is contained in:
gmorel
2013-09-03 11:02:36 +02:00
parent 6ee99b6cad
commit 19ea6d25df
278 changed files with 261 additions and 4658 deletions

View File

@@ -303,6 +303,9 @@
<column name="description" type="CLOB" />
<column name="chapo" type="LONGVARCHAR" />
<column name="postscriptum" type="LONGVARCHAR" />
<unique name="name_UNIQUE">
<unique-column name="name" />
</unique>
<behavior name="timestampable" />
<behavior name="i18n">
<parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -740,54 +743,24 @@
</table>
<table name="message" namespace="Thelia\Model">
<column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
<column name="code" required="true" size="45" type="VARCHAR" />
<column name="name" required="true" size="255" type="VARCHAR" />
<column name="secured" type="TINYINT" />
<column name="ref" size="255" type="VARCHAR" />
<column name="title" type="LONGVARCHAR" />
<column name="description" type="CLOB" />
<column name="description_html" type="CLOB" />
<column name="subject" type="LONGVARCHAR" />
<column name="text_message" type="CLOB" />
<column name="html_message" type="CLOB" />
<unique name="name_UNIQUE">
<unique-column name="name" />
</unique>
<behavior name="timestampable" />
<behavior name="i18n">
<parameter name="i18n_columns" value="title, description, description_html" />
<parameter name="i18n_columns" value="title, subject, text_message, html_message" />
</behavior>
<behavior name="versionable">
<parameter name="log_created_at" value="true" />
<parameter name="log_created_by" value="true" />
</behavior>
</table>
<table name="rewriting" namespace="Thelia\Model">
<column name="id" primaryKey="true" required="true" type="INTEGER" />
<column name="url" required="true" size="255" type="VARCHAR" />
<column name="product_id" type="INTEGER" />
<column name="category_id" type="INTEGER" />
<column name="folder_id" type="INTEGER" />
<column name="content_id" type="INTEGER" />
<foreign-key foreignTable="product" name="fk_rewriting_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
<reference foreign="id" local="product_id" />
</foreign-key>
<foreign-key foreignTable="category" name="fk_rewriting_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
<reference foreign="id" local="category_id" />
</foreign-key>
<foreign-key foreignTable="folder" name="fk_rewriting_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
<reference foreign="id" local="folder_id" />
</foreign-key>
<foreign-key foreignTable="content" name="fk_rewriting_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
<reference foreign="id" local="content_id" />
</foreign-key>
<index name="idx_rewriting_product_id">
<index-column name="product_id" />
</index>
<index name="idx_rewriting_category_id">
<index-column name="category_id" />
</index>
<index name="idx_rewriting_folder_id">
<index-column name="folder_id" />
</index>
<index name="idx_rewriting_content_id">
<index-column name="content_id" />
</index>
<behavior name="timestampable" />
</table>
<table name="coupon" namespace="Thelia\Model">
<column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
<column name="code" required="true" size="45" type="VARCHAR" />
@@ -1121,4 +1094,37 @@
</index>
<behavior name="timestampable" />
</table>
<table name="rewriting_url" namespace="Thelia\Model">
<column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
<column name="url" required="true" size="255" type="VARCHAR" />
<column name="view" size="255" type="VARCHAR" />
<column name="view_id" size="255" type="VARCHAR" />
<column name="view_locale" size="255" type="VARCHAR" />
<column name="redirected" type="INTEGER" />
<foreign-key foreignTable="rewriting_url" name="fk_rewriting_url_redirected" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference foreign="id" local="redirected" />
</foreign-key>
<unique name="url_UNIQUE">
<unique-column name="url" />
</unique>
<index name="idx_view_id">
<index-column name="view_id" />
</index>
<index name="idx_rewriting_url_redirected">
<index-column name="redirected" />
</index>
<behavior name="timestampable" />
</table>
<table name="rewriting_argument" namespace="Thelia\Model">
<column name="rewriting_url_id" primaryKey="true" required="true" type="INTEGER" />
<column name="parameter" primaryKey="true" required="true" size="255" type="VARCHAR" />
<column name="value" primaryKey="true" required="true" size="255" type="VARCHAR" />
<foreign-key foreignTable="rewriting_url" name="fk_rewriting_argument_rewirting_url_id" onDelete="CASCADE" onUpdate="RESTRICT">
<reference foreign="id" local="rewriting_url_id" />
</foreign-key>
<index name="idx_rewriting_argument_rewirting_url_id">
<index-column name="rewriting_url_id" />
</index>
<behavior name="timestampable" />
</table>
</database>