// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
+13 -2
View File
@@ -61,7 +61,7 @@ CREATE TABLE `PREFIX_attachment` (
`id_attachment` int(10) unsigned NOT NULL auto_increment,
`file` varchar(40) NOT NULL,
`file_name` varchar(128) NOT NULL,
`mime` varchar(64) NOT NULL,
`mime` varchar(128) NOT NULL,
PRIMARY KEY (`id_attachment`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
@@ -290,6 +290,16 @@ CREATE TABLE `PREFIX_cms_category_lang` (
KEY `category_name` (`name`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_compare_product` (
`id_compare_product` int(10) unsigned NOT NULL AUTO_INCREMENT,
`id_product` int(10) unsigned NOT NULL,
`id_guest` int(10) unsigned NOT NULL,
`id_customer` int(10) unsigned NOT NULL,
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
PRIMARY KEY (`id_compare_product`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_configuration` (
`id_configuration` int(10) unsigned NOT NULL auto_increment,
`id_group_shop` INT(11) UNSIGNED DEFAULT NULL,
@@ -739,7 +749,7 @@ CREATE TABLE `PREFIX_hook_module_exceptions` (
CREATE TABLE `PREFIX_image` (
`id_image` int(10) unsigned NOT NULL auto_increment,
`id_product` int(10) unsigned NOT NULL,
`position` tinyint(2) unsigned NOT NULL default '0',
`position` smallint(2) unsigned NOT NULL default '0',
`cover` tinyint(1) unsigned NOT NULL default '0',
PRIMARY KEY (`id_image`),
KEY `image_product` (`id_product`),
@@ -776,6 +786,7 @@ CREATE TABLE `PREFIX_lang` (
`active` tinyint(3) unsigned NOT NULL default '0',
`iso_code` char(2) NOT NULL,
`language_code` char(5) NOT NULL,
`is_rtl` TINYINT(1) NOT NULL default '0',
PRIMARY KEY (`id_lang`),
KEY `lang_iso_code` (`iso_code`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;