Index: branches/unlabeled/unlabeled-1.4.2/core/install/install_schema.sql =================================================================== diff -u -r7849 -r7874 --- branches/unlabeled/unlabeled-1.4.2/core/install/install_schema.sql (.../install_schema.sql) (revision 7849) +++ branches/unlabeled/unlabeled-1.4.2/core/install/install_schema.sql (.../install_schema.sql) (revision 7874) @@ -41,7 +41,7 @@ prompt varchar(255) default NULL, element_type varchar(20) NOT NULL default '', validation varchar(255) default NULL, - ValueList text, + ValueList text default NULL, DisplayOrder double NOT NULL default '0', GroupDisplayOrder double NOT NULL default '0', Install int(11) NOT NULL default '1', @@ -61,18 +61,17 @@ CREATE TABLE EmailMessage ( EmailMessageId int(10) NOT NULL auto_increment, Template longtext, - ReplacementTags text, MessageType enum('html','text') NOT NULL default 'text', LanguageId int(11) NOT NULL default '0', EventId int(11) NOT NULL default '0', - `Subject` text, + Subject text, PRIMARY KEY (EmailMessageId) ); CREATE TABLE EmailQueue ( - Subject text, - toaddr text, - fromaddr text, + Subject text NOT NULL, + toaddr text NOT NULL, + fromaddr text NOT NULL, message blob, headers blob, queued timestamp NOT NULL @@ -87,7 +86,7 @@ EventId int(11) NOT NULL auto_increment, Event varchar(40) NOT NULL default '', Enabled int(11) NOT NULL default '1', - FromUserId int(11) NOT NULL default '-1', + FromUserId int(11) NOT NULL default '0', Module varchar(40) NOT NULL default '', Description varchar(255) NOT NULL default '', Type int(11) NOT NULL default '0', @@ -102,31 +101,31 @@ LanguageId int(11) NOT NULL auto_increment, PackName varchar(40) NOT NULL default '', LocalName varchar(40) NOT NULL default '', - Enabled int(11) NOT NULL default '1', + Enabled int(11) NOT NULL default '0', PrimaryLang int(11) NOT NULL default '0', IconURL varchar(255) default NULL, DateFormat varchar(50) NOT NULL default '', TimeFormat varchar(50) NOT NULL default '', - InputDateFormat varchar(50) NOT NULL default 'm/d/Y', - InputTimeFormat varchar(50) NOT NULL default 'g:i:s A', - DecimalPoint char(2) NOT NULL default '', - ThousandSep tinytext, - `Charset` varchar(20) NOT NULL default '', + InputDateFormat varchar(50) NOT NULL default '', + InputTimeFormat varchar(50) NOT NULL default '', + DecimalPoint char(2) NOT NULL default '.', + ThousandSep tinytext NULL, + Charset varchar(20) NOT NULL default '', UnitSystem tinyint(4) NOT NULL default '1', PRIMARY KEY (LanguageId) ); CREATE TABLE Modules ( - `Name` varchar(255) NOT NULL default '', + Name varchar(255) NOT NULL default '', Path varchar(255) NOT NULL default '', Var varchar(10) NOT NULL default '', - Version varchar(10) NOT NULL default '0.0.0', + Version varchar(10) NOT NULL default '', Loaded tinyint(4) NOT NULL default '1', LoadOrder tinyint(4) NOT NULL default '0', TemplatePath varchar(255) NOT NULL default '', RootCat int(11) NOT NULL default '0', - BuildDate int(10) unsigned default NULL, - PRIMARY KEY (`Name`) + BuildDate double NOT NULL default '0', + PRIMARY KEY (Name) ); CREATE TABLE PersistantSessionData ( @@ -139,7 +138,7 @@ CREATE TABLE Phrase ( Phrase varchar(255) NOT NULL default '', - Translation text NOT NULL, + Translation text NOT NULL default '', PhraseType int(11) NOT NULL default '0', PhraseId int(11) NOT NULL auto_increment, LanguageId int(11) NOT NULL default '0', @@ -185,7 +184,7 @@ LastName varchar(255) default NULL, Company varchar(255) NOT NULL default '', Email varchar(255) NOT NULL default '', - CreatedOn INT DEFAULT NULL, + CreatedOn double NOT NULL default '0', Phone varchar(20) default NULL, Fax varchar(255) NOT NULL default '', Street varchar(255) default NULL, @@ -197,13 +196,13 @@ ResourceId int(11) NOT NULL default '0', `Status` tinyint(4) NOT NULL default '2', Modified int(11) NOT NULL default '0', - dob INT(11) NULL DEFAULT NULL, + dob double NOT NULL default '0', tz int(11) default NULL, ip varchar(20) default NULL, IsBanned tinyint(1) NOT NULL default '0', - PassResetTime INT(11) UNSIGNED NULL DEFAULT NULL, + PassResetTime bigint(20) default NULL, PwResetConfirm varchar(255) default NULL, - PwRequestTime INT(11) UNSIGNED NULL DEFAULT NULL, + PwRequestTime bigint(25) default NULL, MinPwResetDelay int(11) NOT NULL default '1800', PRIMARY KEY (PortalUserId), UNIQUE KEY ResourceId (ResourceId), @@ -308,7 +307,7 @@ DestParentId int(11) default NULL, DestName varchar(255) NOT NULL default '', DestAbbr char(3) NOT NULL default '', - DestAbbr2 char(2) default NULL, + DestAbbr2 char(2) default '', PRIMARY KEY (DestId) ); @@ -324,24 +323,25 @@ 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, + Description text NOT NULL, + l1_Description text NOT NULL, + l2_Description text NOT NULL, + l3_Description text NOT NULL, + l4_Description text NOT NULL, + l5_Description text NOT NULL, CreatedOn int(11) NOT NULL default '0', EditorsPick tinyint(4) NOT NULL default '0', `Status` tinyint(4) NOT NULL default '0', + Pop tinyint(4) default NULL, Priority int(11) NOT NULL default '0', MetaKeywords varchar(255) default NULL, CachedDescendantCatsQty int(11) default NULL, - CachedNavbar text, - l1_CachedNavbar text, - l2_CachedNavbar text, - l3_CachedNavbar text, - l4_CachedNavbar text, - l5_CachedNavbar text, + CachedNavbar text NOT NULL, + l1_CachedNavbar text NOT NULL, + l2_CachedNavbar text NOT NULL, + l3_CachedNavbar text NOT NULL, + l4_CachedNavbar text NOT NULL, + l5_CachedNavbar text NOT NULL, CreatedById int(11) NOT NULL default '0', ResourceId int(11) default NULL, ParentPath text NOT NULL, @@ -397,6 +397,7 @@ CategoryId int(11) NOT NULL default '0', PermId int(11) NOT NULL default '0', ACL varchar(255) NOT NULL default '', + DACL varchar(255) NOT NULL default '', PRIMARY KEY (PermCacheId), KEY CategoryId (CategoryId), KEY PermId (PermId)