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

fix conflicts

Browse Source
This commit is contained in:
Etienne Roudeix
2014-01-06 12:14:56 +01:00
parent 99038e688a
commit 6a64f827ce
5 changed files with 24 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
local/config/schema.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<database defaultIdMethod="native" name="thelia">
<table name="category" namespace="Thelia\Model">
<column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
@@ -58,6 +58,7 @@
<parameter name="log_created_at" value="true" />
<parameter name="log_created_by" value="true" />
</behavior>
<behavior name="query_cache" />
</table>
<table isCrossRef="true" name="product_category" namespace="Thelia\Model">
<column name="product_id" primaryKey="true" required="true" type="INTEGER" />
@@ -853,7 +854,7 @@
<column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
<column name="code" required="true" size="45" type="VARCHAR" />
<column name="type" required="true" size="255" type="VARCHAR" />
<column name="serialized_effects" required="true" type="LONGVARCHAR" />
<column name="serialized_effects" required="true" type="LONG VARCHAR" />
<column name="title" required="true" size="255" type="VARCHAR" />
<column name="is_enabled" required="true" type="BOOLEAN" />
<column name="short_description" required="true" type="LONGVARCHAR" />