Index: branches/5.0.x/core/install/install_schema.sql =================================================================== diff -u -r12638 -r12639 --- branches/5.0.x/core/install/install_schema.sql (.../install_schema.sql) (revision 12638) +++ branches/5.0.x/core/install/install_schema.sql (.../install_schema.sql) (revision 12639) @@ -371,79 +371,74 @@ ); CREATE TABLE Category ( - CategoryId int(11) NOT NULL auto_increment, - `Type` int(11) NOT NULL default '0', - SymLinkCategoryId int(10) unsigned default NULL, - ParentId int(11) NOT NULL default '0', - `Name` varchar(255) NOT NULL default '', - l1_Name varchar(255) NOT NULL default '', - l2_Name varchar(255) NOT NULL default '', - l3_Name varchar(255) NOT NULL default '', - l4_Name varchar(255) NOT NULL default '', - l5_Name varchar(255) NOT NULL default '', - Filename varchar(255) NOT NULL default '', - AutomaticFilename tinyint(3) unsigned NOT NULL default '1', + CategoryId int(11) NOT NULL AUTO_INCREMENT, + `Type` int(11) NOT NULL DEFAULT '0', + SymLinkCategoryId int(10) unsigned DEFAULT NULL, + ParentId int(11) NOT NULL DEFAULT '0', + `Name` varchar(255) NOT NULL DEFAULT '', + l1_Name varchar(255) NOT NULL DEFAULT '', + l2_Name varchar(255) NOT NULL DEFAULT '', + l3_Name varchar(255) NOT NULL DEFAULT '', + l4_Name varchar(255) NOT NULL DEFAULT '', + l5_Name varchar(255) NOT NULL DEFAULT '', + Filename varchar(255) NOT NULL DEFAULT '', + AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1', Description text, l1_Description text, l2_Description text, l3_Description text, l4_Description text, l5_Description text, - CreatedOn int(11) NOT NULL default '0', - EditorsPick tinyint(4) NOT NULL default '0', - `Status` tinyint(4) NOT NULL default '2', - Priority int(11) NOT NULL default '0', + CreatedOn int(11) NOT NULL DEFAULT '0', + EditorsPick tinyint(4) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '2', + Priority int(11) NOT NULL DEFAULT '0', MetaKeywords text, - CachedDescendantCatsQty int(11) default NULL, + CachedDescendantCatsQty int(11) DEFAULT NULL, CachedNavbar text, l1_CachedNavbar text, l2_CachedNavbar text, l3_CachedNavbar text, l4_CachedNavbar text, l5_CachedNavbar text, - CreatedById int(11) NOT NULL default '0', - ResourceId int(11) default NULL, + CreatedById int(11) NOT NULL DEFAULT '0', + ResourceId int(11) DEFAULT NULL, ParentPath text, - TreeLeft bigint(20) NOT NULL default '0', - TreeRight bigint(20) NOT NULL default '0', + TreeLeft bigint(20) NOT NULL DEFAULT '0', + TreeRight bigint(20) NOT NULL DEFAULT '0', NamedParentPath text, MetaDescription text, - HotItem int(11) NOT NULL default '2', - NewItem int(11) NOT NULL default '2', - PopItem int(11) NOT NULL default '2', - Modified int(11) NOT NULL default '0', - ModifiedById int(11) NOT NULL default '0', + HotItem int(11) NOT NULL DEFAULT '2', + NewItem int(11) NOT NULL DEFAULT '2', + PopItem int(11) NOT NULL DEFAULT '2', + Modified int(11) NOT NULL DEFAULT '0', + ModifiedById int(11) NOT NULL DEFAULT '0', CachedTemplate varchar(255) NOT NULL, - Template varchar(255) NOT NULL default '#inherit#', - UseExternalUrl tinyint(3) unsigned NOT NULL default '0', - ExternalUrl varchar(255) NOT NULL default '', - UseMenuIconUrl tinyint(3) unsigned NOT NULL default '0', - MenuIconUrl varchar(255) NOT NULL default '', - l1_Title varchar(255) default '', - l2_Title varchar(255) default '', - l3_Title varchar(255) default '', - l4_Title varchar(255) default '', - l5_Title varchar(255) default '', - l1_MenuTitle varchar(255) NOT NULL default '', - l2_MenuTitle varchar(255) NOT NULL default '', - l3_MenuTitle varchar(255) NOT NULL default '', - l4_MenuTitle varchar(255) NOT NULL default '', - l5_MenuTitle varchar(255) NOT NULL default '', + Template varchar(255) NOT NULL DEFAULT '#inherit#', + UseExternalUrl tinyint(3) unsigned NOT NULL DEFAULT '0', + ExternalUrl varchar(255) NOT NULL DEFAULT '', + UseMenuIconUrl tinyint(3) unsigned NOT NULL DEFAULT '0', + MenuIconUrl varchar(255) NOT NULL DEFAULT '', + l1_Title varchar(255) DEFAULT '', + l2_Title varchar(255) DEFAULT '', + l3_Title varchar(255) DEFAULT '', + l4_Title varchar(255) DEFAULT '', + l5_Title varchar(255) DEFAULT '', + l1_MenuTitle varchar(255) NOT NULL DEFAULT '', + l2_MenuTitle varchar(255) NOT NULL DEFAULT '', + l3_MenuTitle varchar(255) NOT NULL DEFAULT '', + l4_MenuTitle varchar(255) NOT NULL DEFAULT '', + l5_MenuTitle varchar(255) NOT NULL DEFAULT '', MetaTitle text, IndexTools text, - IsIndex tinyint(1) NOT NULL default '0', - IsMenu tinyint(4) NOT NULL default '1', - IsSystem tinyint(4) NOT NULL default '0', - FormId int(11) default NULL, - FormSubmittedTemplate varchar(255) default NULL, - l1_Translated tinyint(4) NOT NULL default '0', - l2_Translated tinyint(4) NOT NULL default '0', - l3_Translated tinyint(4) NOT NULL default '0', - l4_Translated tinyint(4) NOT NULL default '0', - l5_Translated tinyint(4) NOT NULL default '0', - FriendlyURL varchar(255) NOT NULL default '', + IsIndex tinyint(1) NOT NULL DEFAULT '0', + IsMenu tinyint(4) NOT NULL DEFAULT '1', + IsSystem tinyint(4) NOT NULL DEFAULT '0', + FormId int(11) DEFAULT NULL, + FormSubmittedTemplate varchar(255) DEFAULT NULL, + FriendlyURL varchar(255) NOT NULL DEFAULT '', ThemeId int(10) unsigned NOT NULL, - PRIMARY KEY (CategoryId), + PRIMARY KEY (CategoryId), UNIQUE KEY ResourceId (ResourceId), KEY ParentId (ParentId), KEY Modified (Modified), @@ -467,11 +462,6 @@ KEY CreatedOn (CreatedOn), KEY EditorsPick (EditorsPick), KEY IsIndex (IsIndex), - KEY l1_Translated (l1_Translated), - KEY l2_Translated (l2_Translated), - KEY l3_Translated (l3_Translated), - KEY l4_Translated (l4_Translated), - KEY l5_Translated (l5_Translated), KEY ThemeId (ThemeId) ); @@ -1035,20 +1025,15 @@ ); CREATE TABLE PageContent ( - PageContentId int(11) NOT NULL auto_increment, - ContentNum int(11) NOT NULL default '0', - PageId int(11) NOT NULL default '0', + PageContentId int(11) NOT NULL AUTO_INCREMENT, + ContentNum int(11) NOT NULL DEFAULT '0', + PageId int(11) NOT NULL DEFAULT '0', l1_Content text, l2_Content text, l3_Content text, l4_Content text, l5_Content text, - l1_Translated tinyint(4) NOT NULL default '0', - l2_Translated tinyint(4) NOT NULL default '0', - l3_Translated tinyint(4) NOT NULL default '0', - l4_Translated tinyint(4) NOT NULL default '0', - l5_Translated tinyint(4) NOT NULL default '0', - PRIMARY KEY (PageContentId), + PRIMARY KEY (PageContentId), KEY ContentNum (ContentNum,PageId) );