0000211: Make all fields, that contain dates NULL with NULL default value

Index: core/install/install_schema.sql =================================================================== --- core/install/install_schema.sql (revision 12650) +++ core/install/install_schema.sql (working copy) @@ -80,16 +80,16 @@ ); CREATE TABLE EmailQueue ( ~~- EmailQueueId int(10) unsigned NOT NULL auto_increment,~~ ~~- ToEmail varchar(255) NOT NULL default '',~~ ~~- `Subject` varchar(255) NOT NULL default '',~~ + EmailQueueId int(10) unsigned NOT NULL AUTO_INCREMENT, + ToEmail varchar(255) NOT NULL DEFAULT '', + `Subject` varchar(255) NOT NULL DEFAULT '', MessageHeaders text, MessageBody longtext, ~~- Queued int(10) unsigned NOT NULL default '0',~~ ~~- SendRetries int(10) unsigned NOT NULL default '0',~~ ~~- LastSendRetry int(10) unsigned NOT NULL default '0',~~ ~~- MailingId int(10) unsigned NOT NULL,~~ ~~- PRIMARY KEY (EmailQueueId),~~ + Queued int(10) unsigned DEFAULT NULL, + SendRetries int(10) unsigned NOT NULL DEFAULT '0', + LastSendRetry int(10) unsigned DEFAULT NULL, + MailingId int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (EmailQueueId), KEY LastSendRetry (LastSendRetry), KEY SendRetries (SendRetries), KEY MailingId (MailingId) @@ -124,27 +124,27 @@ ); CREATE TABLE Language ( ~~- 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',~~ ~~- PrimaryLang int(11) NOT NULL default '0',~~ ~~- AdminInterfaceLang tinyint(3) unsigned NOT NULL default '0',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- IconURL varchar(255) default NULL,~~ ~~- IconDisabledURL 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 varchar(10) NOT NULL default '',~~ ~~- ThousandSep varchar(10) NOT NULL default '',~~ ~~- `Charset` varchar(20) NOT NULL default '',~~ ~~- UnitSystem tinyint(4) NOT NULL default '1',~~ + 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', + PrimaryLang int(11) NOT NULL DEFAULT '0', + AdminInterfaceLang tinyint(3) unsigned NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + IconURL varchar(255) DEFAULT NULL, + IconDisabledURL 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 varchar(10) NOT NULL DEFAULT '', + ThousandSep varchar(10) NOT NULL DEFAULT '', + `Charset` varchar(20) NOT NULL DEFAULT '', + UnitSystem tinyint(4) NOT NULL DEFAULT '1', FilenameReplacements text, ~~- Locale varchar(10) NOT NULL default 'en-US',~~ ~~- UserDocsUrl varchar(255) NOT NULL,~~ ~~- PRIMARY KEY (LanguageId),~~ + Locale varchar(10) NOT NULL DEFAULT 'en-US', + UserDocsUrl varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (LanguageId), KEY Enabled (Enabled), KEY PrimaryLang (PrimaryLang), KEY AdminInterfaceLang (AdminInterfaceLang), @@ -167,10 +167,10 @@ ); CREATE TABLE PersistantSessionData ( ~~- VariableId bigint(20) NOT NULL auto_increment,~~ ~~- PortalUserId int(11) NOT NULL default '0',~~ ~~- VariableName varchar(255) NOT NULL default '',~~ ~~- VariableValue text NOT NULL,~~ + VariableId bigint(20) NOT NULL AUTO_INCREMENT, + PortalUserId int(11) NOT NULL DEFAULT '0', + VariableName varchar(255) NOT NULL DEFAULT '', + VariableValue text, PRIMARY KEY (VariableId), KEY UserId (PortalUserId), KEY VariableName (VariableName) @@ -178,12 +178,12 @@ CREATE TABLE Phrase ( Phrase varchar(255) NOT NULL DEFAULT '', ~~- PhraseKey varchar(255) NOT NULL,~~ ~~- Translation text NOT NULL,~~ + PhraseKey varchar(255) NOT NULL DEFAULT '', + Translation text, PhraseType int(11) NOT NULL DEFAULT '0', PhraseId int(11) NOT NULL AUTO_INCREMENT, LanguageId int(11) NOT NULL DEFAULT '0', ~~- LastChanged int(10) unsigned NOT NULL DEFAULT '0',~~ + LastChanged int(10) unsigned DEFAULT NULL, LastChangeIP varchar(15) NOT NULL DEFAULT '', Module varchar(30) NOT NULL DEFAULT 'In-Portal', PRIMARY KEY (PhraseId), @@ -194,13 +194,13 @@ ); CREATE TABLE PhraseCache ( ~~- Template varchar(40) NOT NULL default '',~~ ~~- PhraseList text NOT NULL,~~ ~~- CacheDate int(11) NOT NULL default '0',~~ ~~- ThemeId int(11) NOT NULL default '0',~~ ~~- StylesheetId int(10) unsigned NOT NULL default '0',~~ + Template varchar(40) NOT NULL DEFAULT '', + PhraseList text, + CacheDate int(11) NOT NULL DEFAULT '0', + ThemeId int(11) NOT NULL DEFAULT '0', + StylesheetId int(10) unsigned NOT NULL DEFAULT '0', ConfigVariables text, ~~- PRIMARY KEY (Template),~~ + PRIMARY KEY (Template), KEY CacheDate (CacheDate), KEY ThemeId (ThemeId), KEY StylesheetId (StylesheetId) @@ -223,38 +223,38 @@ ); CREATE TABLE PortalUser ( ~~- PortalUserId int(11) NOT NULL auto_increment,~~ ~~- Login varchar(255) default NULL,~~ ~~- `Password` VARCHAR(255) NULL DEFAULT 'd41d8cd98f00b204e9800998ecf8427e',~~ ~~- FirstName VARCHAR(255) NOT NULL DEFAULT '',~~ ~~- LastName VARCHAR(255) NOT NULL DEFAULT '',~~ ~~- Company varchar(255) NOT NULL default '',~~ ~~- Email varchar(255) NOT NULL default '',~~ ~~- CreatedOn INT DEFAULT NULL,~~ ~~- Phone varchar(20) default NULL,~~ ~~- Fax varchar(255) NOT NULL default '',~~ ~~- Street varchar(255) default NULL,~~ ~~- Street2 varchar(255) NOT NULL default '',~~ ~~- City varchar(20) default NULL,~~ ~~- State varchar(20) NOT NULL default '',~~ ~~- Zip varchar(20) default NULL,~~ ~~- Country varchar(20) NOT NULL default '',~~ ~~- 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,~~ ~~- tz int(11) default NULL,~~ ~~- ip varchar(20) default NULL,~~ ~~- IsBanned tinyint(1) NOT NULL default '0',~~ ~~- PassResetTime INT(11) UNSIGNED NULL DEFAULT NULL,~~ ~~- PwResetConfirm varchar(255) default NULL,~~ ~~- PwRequestTime INT(11) UNSIGNED NULL DEFAULT NULL,~~ ~~- MinPwResetDelay int(11) NOT NULL default '1800',~~ ~~- PRIMARY KEY (PortalUserId),~~ + PortalUserId int(11) NOT NULL AUTO_INCREMENT, + Login varchar(255) DEFAULT NULL, + `Password` varchar(255) DEFAULT 'd41d8cd98f00b204e9800998ecf8427e', + FirstName varchar(255) NOT NULL DEFAULT '', + LastName varchar(255) NOT NULL DEFAULT '', + Company varchar(255) NOT NULL DEFAULT '', + Email varchar(255) NOT NULL DEFAULT '', + CreatedOn int(11) DEFAULT NULL, + Phone varchar(20) DEFAULT NULL, + Fax varchar(255) NOT NULL DEFAULT '', + Street varchar(255) DEFAULT NULL, + Street2 varchar(255) NOT NULL DEFAULT '', + City varchar(20) DEFAULT NULL, + State varchar(20) NOT NULL DEFAULT '', + Zip varchar(20) DEFAULT NULL, + Country varchar(20) NOT NULL DEFAULT '', + ResourceId int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + Modified int(11) DEFAULT NULL, + dob int(11) DEFAULT NULL, + tz int(11) DEFAULT NULL, + ip varchar(20) DEFAULT NULL, + IsBanned tinyint(1) NOT NULL DEFAULT '0', + PassResetTime int(11) unsigned DEFAULT NULL, + PwResetConfirm varchar(255) DEFAULT NULL, + PwRequestTime int(11) unsigned DEFAULT NULL, + MinPwResetDelay int(11) NOT NULL DEFAULT '1800', + PRIMARY KEY (PortalUserId), UNIQUE KEY ResourceId (ResourceId), UNIQUE KEY Login (Login), KEY CreatedOn (CreatedOn), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY Modified (Modified), KEY dob (dob), KEY IsBanned (IsBanned) @@ -268,10 +268,10 @@ ); CREATE TABLE SessionData ( ~~- SessionKey varchar(50) NOT NULL default '',~~ ~~- VariableName varchar(255) NOT NULL default '',~~ ~~- VariableValue longtext NOT NULL,~~ ~~- PRIMARY KEY (SessionKey,VariableName),~~ + SessionKey varchar(50) NOT NULL DEFAULT '', + VariableName varchar(255) NOT NULL DEFAULT '', + VariableValue longtext, + PRIMARY KEY (SessionKey,VariableName), KEY SessionKey (SessionKey), KEY VariableName (VariableName) ); @@ -338,14 +338,14 @@ ); CREATE TABLE EmailLog ( ~~- EmailLogId int(11) NOT NULL auto_increment,~~ ~~- fromuser varchar(200) default NULL,~~ ~~- addressto varchar(255) default NULL,~~ ~~- `subject` varchar(255) default NULL,~~ ~~- `timestamp` bigint(20) default '0',~~ ~~- event varchar(100) default NULL,~~ ~~- EventParams text NOT NULL,~~ ~~- PRIMARY KEY (EmailLogId),~~ + EmailLogId int(11) NOT NULL AUTO_INCREMENT, + fromuser varchar(200) DEFAULT NULL, + addressto varchar(255) DEFAULT NULL, + `subject` varchar(255) DEFAULT NULL, + `timestamp` bigint(20) DEFAULT '0', + `event` varchar(100) DEFAULT NULL, + EventParams text, + PRIMARY KEY (EmailLogId), KEY `timestamp` (`timestamp`) ); @@ -389,9 +389,9 @@ l3_Description text, l4_Description text, l5_Description text, ~~- CreatedOn int(11) NOT NULL DEFAULT '0',~~ + CreatedOn int(11) DEFAULT NULL, EditorsPick tinyint(4) NOT NULL DEFAULT '0', ~~- `Status` tinyint(4) NOT NULL DEFAULT '2',~~ + `Status` tinyint(4) NOT NULL DEFAULT '1', Priority int(11) NOT NULL DEFAULT '0', MetaKeywords text, CachedDescendantCatsQty int(11) DEFAULT NULL, @@ -411,7 +411,7 @@ 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',~~ + Modified int(11) DEFAULT NULL, ModifiedById int(11) NOT NULL DEFAULT '0', CachedTemplate varchar(255) NOT NULL DEFAULT '', Template varchar(255) NOT NULL DEFAULT '#inherit#', @@ -496,13 +496,13 @@ ); CREATE TABLE Stylesheets ( ~~- StylesheetId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- Description varchar(255) NOT NULL default '',~~ ~~- AdvancedCSS text NOT NULL,~~ ~~- LastCompiled int(10) unsigned NOT NULL default '0',~~ ~~- Enabled int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (StylesheetId),~~ + StylesheetId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + Description varchar(255) NOT NULL DEFAULT '', + AdvancedCSS text, + LastCompiled int(10) unsigned DEFAULT NULL, + Enabled int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (StylesheetId), KEY Enabled (Enabled), KEY LastCompiled (LastCompiled) ); @@ -533,32 +533,32 @@ ); CREATE TABLE Skins ( ~~- SkinId int(11) NOT NULL auto_increment,~~ ~~- `Name` varchar(255) default NULL,~~ + SkinId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) DEFAULT NULL, CSS text, ~~- Logo varchar(255) default NULL,~~ ~~- LogoBottom varchar(255) NOT NULL,~~ ~~- LogoLogin varchar(255) NOT NULL,~~ ~~- Options text,~~ ~~- LastCompiled int(11) NOT NULL default '0',~~ ~~- IsPrimary int(1) NOT NULL default '0',~~ ~~- PRIMARY KEY (SkinId),~~ + Logo varchar(255) DEFAULT NULL, + LogoBottom varchar(255) NOT NULL DEFAULT '', + LogoLogin varchar(255) NOT NULL DEFAULT '', + `Options` text, + LastCompiled int(11) NOT NULL DEFAULT '0', + IsPrimary int(1) NOT NULL DEFAULT '0', + PRIMARY KEY (SkinId), KEY IsPrimary (IsPrimary), KEY LastCompiled (LastCompiled) ); CREATE TABLE ChangeLogs ( ~~- ChangeLogId bigint(20) NOT NULL auto_increment,~~ ~~- PortalUserId int(11) NOT NULL default '0',~~ ~~- SessionLogId int(11) NOT NULL default '0',~~ ~~- `Action` tinyint(4) NOT NULL default '0',~~ ~~- OccuredOn int(11) NOT NULL default '0',~~ ~~- Prefix varchar(255) NOT NULL default '',~~ ~~- ItemId bigint(20) NOT NULL default '0',~~ ~~- Changes text NOT NULL,~~ ~~- MasterPrefix varchar(255) NOT NULL default '',~~ ~~- MasterId bigint(20) NOT NULL default '0',~~ ~~- PRIMARY KEY (ChangeLogId),~~ + ChangeLogId bigint(20) NOT NULL AUTO_INCREMENT, + PortalUserId int(11) NOT NULL DEFAULT '0', + SessionLogId int(11) NOT NULL DEFAULT '0', + `Action` tinyint(4) NOT NULL DEFAULT '0', + OccuredOn int(11) DEFAULT NULL, + Prefix varchar(255) NOT NULL DEFAULT '', + ItemId bigint(20) NOT NULL DEFAULT '0', + Changes text, + MasterPrefix varchar(255) NOT NULL DEFAULT '', + MasterId bigint(20) NOT NULL DEFAULT '0', + PRIMARY KEY (ChangeLogId), KEY PortalUserId (PortalUserId), KEY SessionLogId (SessionLogId), KEY `Action` (`Action`), @@ -568,15 +568,15 @@ ); CREATE TABLE SessionLogs ( ~~- SessionLogId bigint(20) NOT NULL auto_increment,~~ ~~- PortalUserId int(11) NOT NULL default '0',~~ ~~- SessionId int(10) NOT NULL default '0',~~ ~~- `Status` tinyint(4) NOT NULL default '1',~~ ~~- SessionStart int(11) NOT NULL default '0',~~ ~~- SessionEnd int(11) default NULL,~~ ~~- IP varchar(15) NOT NULL default '',~~ ~~- AffectedItems int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (SessionLogId),~~ + SessionLogId bigint(20) NOT NULL AUTO_INCREMENT, + PortalUserId int(11) NOT NULL DEFAULT '0', + SessionId int(10) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + SessionStart int(11) DEFAULT NULL, + SessionEnd int(11) DEFAULT NULL, + IP varchar(15) NOT NULL DEFAULT '', + AffectedItems int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (SessionLogId), KEY SessionId (SessionId), KEY `Status` (`Status`), KEY PortalUserId (PortalUserId) @@ -756,24 +756,24 @@ ); CREATE TABLE ItemReview ( ~~- ReviewId int(11) NOT NULL auto_increment,~~ ~~- CreatedOn INT UNSIGNED NULL DEFAULT NULL,~~ ~~- ReviewText longtext NOT NULL,~~ ~~- Rating tinyint(3) unsigned default NULL,~~ ~~- IPAddress varchar(255) NOT NULL default '',~~ ~~- ItemId int(11) NOT NULL default '0',~~ ~~- CreatedById int(11) NOT NULL default '-1',~~ ~~- ItemType tinyint(4) NOT NULL default '0',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- Status tinyint(4) NOT NULL default '2',~~ ~~- TextFormat int(11) NOT NULL default '0',~~ ~~- Module varchar(255) NOT NULL default '',~~ ~~- PRIMARY KEY (ReviewId),~~ + ReviewId int(11) NOT NULL AUTO_INCREMENT, + CreatedOn int(10) unsigned DEFAULT NULL, + ReviewText longtext, + Rating tinyint(3) unsigned DEFAULT NULL, + IPAddress varchar(255) NOT NULL DEFAULT '', + ItemId int(11) NOT NULL DEFAULT '0', + CreatedById int(11) NOT NULL DEFAULT '-1', + ItemType tinyint(4) NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '2', + TextFormat int(11) NOT NULL DEFAULT '0', + Module varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (ReviewId), KEY CreatedOn (CreatedOn), KEY ItemId (ItemId), KEY ItemType (ItemType), KEY Priority (Priority), ~~- KEY Status (Status)~~ + KEY `Status` (`Status`) ); CREATE TABLE ItemTypes ( @@ -795,19 +795,19 @@ ); CREATE TABLE ItemFiles ( ~~- FileId int(11) NOT NULL auto_increment,~~ ~~- ResourceId int(11) unsigned NOT NULL default '0',~~ ~~- FileName varchar(255) NOT NULL default '',~~ ~~- FilePath varchar(255) NOT NULL default '',~~ ~~- Size int(11) NOT NULL default '0',~~ ~~- `Status` tinyint(4) NOT NULL default '1',~~ ~~- CreatedOn int(11) unsigned NOT NULL default '0',~~ ~~- CreatedById int(11) NOT NULL default '-1',~~ ~~- MimeType varchar(255) NOT NULL default '',~~ ~~- PRIMARY KEY (FileId),~~ + FileId int(11) NOT NULL AUTO_INCREMENT, + ResourceId int(11) unsigned NOT NULL DEFAULT '0', + FileName varchar(255) NOT NULL DEFAULT '', + FilePath varchar(255) NOT NULL DEFAULT '', + Size int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + CreatedOn int(11) unsigned DEFAULT NULL, + CreatedById int(11) NOT NULL DEFAULT '-1', + MimeType varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (FileId), KEY ResourceId (ResourceId), KEY CreatedOn (CreatedOn), ~~- KEY Status (Status)~~ + KEY `Status` (`Status`) ); CREATE TABLE Relationship ( @@ -931,54 +931,54 @@ ); CREATE TABLE ImportScripts ( ~~- ImportId INT(11) NOT NULL auto_increment,~~ ~~- Name VARCHAR(255) NOT NULL DEFAULT '',~~ ~~- Description TEXT NOT NULL,~~ ~~- Prefix VARCHAR(10) NOT NULL DEFAULT '',~~ ~~- Module VARCHAR(50) NOT NULL DEFAULT '',~~ ~~- ExtraFields VARCHAR(255) NOT NULL DEFAULT '',~~ ~~- Type VARCHAR(10) NOT NULL DEFAULT '',~~ ~~- Status TINYINT NOT NULL,~~ + ImportId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + Description text, + Prefix varchar(10) NOT NULL DEFAULT '', + Module varchar(50) NOT NULL DEFAULT '', + ExtraFields varchar(255) NOT NULL DEFAULT '', + `Type` varchar(10) NOT NULL DEFAULT '', + `Status` tinyint(4) NOT NULL DEFAULT '1', PRIMARY KEY (ImportId), KEY Module (Module), ~~- KEY Status (Status)~~ + KEY `Status` (`Status`) ); CREATE TABLE StylesheetSelectors ( ~~- SelectorId int(11) NOT NULL auto_increment,~~ ~~- StylesheetId int(11) NOT NULL default '0',~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- SelectorName varchar(255) NOT NULL default '',~~ ~~- SelectorData text NOT NULL,~~ ~~- Description text NOT NULL,~~ ~~- Type tinyint(4) NOT NULL default '0',~~ ~~- AdvancedCSS text NOT NULL,~~ ~~- ParentId int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (SelectorId),~~ + SelectorId int(11) NOT NULL AUTO_INCREMENT, + StylesheetId int(11) NOT NULL DEFAULT '0', + `Name` varchar(255) NOT NULL DEFAULT '', + SelectorName varchar(255) NOT NULL DEFAULT '', + SelectorData text, + Description text, + `Type` tinyint(4) NOT NULL DEFAULT '0', + AdvancedCSS text, + ParentId int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (SelectorId), KEY StylesheetId (StylesheetId), KEY ParentId (ParentId), KEY `Type` (`Type`) ); CREATE TABLE Visits ( ~~- VisitId int(11) NOT NULL auto_increment,~~ ~~- VisitDate int(10) unsigned NOT NULL default '0',~~ ~~- Referer varchar(255) NOT NULL default '',~~ ~~- IPAddress varchar(15) NOT NULL default '',~~ ~~- AffiliateId int(10) unsigned NOT NULL default '0',~~ ~~- PortalUserId int(11) NOT NULL default '-2',~~ ~~- PRIMARY KEY (VisitId),~~ + VisitId int(11) NOT NULL AUTO_INCREMENT, + VisitDate int(10) unsigned DEFAULT NULL, + Referer varchar(255) NOT NULL DEFAULT '', + IPAddress varchar(15) NOT NULL DEFAULT '', + AffiliateId int(10) unsigned NOT NULL DEFAULT '0', + PortalUserId int(11) NOT NULL DEFAULT '-2', + PRIMARY KEY (VisitId), KEY PortalUserId (PortalUserId), KEY AffiliateId (AffiliateId), KEY VisitDate (VisitDate) ); CREATE TABLE ImportCache ( ~~- CacheId int(11) NOT NULL auto_increment,~~ ~~- CacheName varchar(255) NOT NULL default '',~~ ~~- VarName int(11) NOT NULL default '0',~~ ~~- VarValue text NOT NULL,~~ ~~- PRIMARY KEY (CacheId),~~ + CacheId int(11) NOT NULL AUTO_INCREMENT, + CacheName varchar(255) NOT NULL DEFAULT '', + VarName int(11) NOT NULL DEFAULT '0', + VarValue text, + PRIMARY KEY (CacheId), KEY CacheName (CacheName), KEY VarName (VarName) ); @@ -1004,19 +1004,19 @@ ); CREATE TABLE MailingLists ( ~~- MailingId int(10) unsigned NOT NULL auto_increment,~~ ~~- PortalUserId int(11) NOT NULL default '-1',~~ + MailingId int(10) unsigned NOT NULL AUTO_INCREMENT, + PortalUserId int(11) NOT NULL DEFAULT '-1', `To` longtext, ToParsed longtext, Attachments text, ~~- `Subject` varchar(255) NOT NULL,~~ + `Subject` varchar(255) NOT NULL DEFAULT '', MessageText longtext, MessageHtml longtext, ~~- `Status` tinyint(3) unsigned NOT NULL default '1',~~ ~~- EmailsQueued int(10) unsigned NOT NULL,~~ ~~- EmailsSent int(10) unsigned NOT NULL,~~ ~~- EmailsTotal int(10) unsigned NOT NULL,~~ ~~- PRIMARY KEY (MailingId),~~ + `Status` tinyint(3) unsigned NOT NULL DEFAULT '1', + EmailsQueued int(10) unsigned NOT NULL DEFAULT '0', + EmailsSent int(10) unsigned NOT NULL DEFAULT '0', + EmailsTotal int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (MailingId), KEY EmailsTotal (EmailsTotal), KEY EmailsSent (EmailsSent), KEY EmailsQueued (EmailsQueued), @@ -1038,22 +1038,22 @@ ); CREATE TABLE FormFields ( ~~- FormFieldId int(11) NOT NULL auto_increment,~~ ~~- FormId int(11) NOT NULL default '0',~~ ~~- Type int(11) NOT NULL default '0',~~ ~~- FieldName varchar(255) NOT NULL default '',~~ ~~- FieldLabel varchar(255) default NULL,~~ ~~- Heading varchar(255) default NULL,~~ ~~- Prompt varchar(255) default NULL,~~ ~~- ElementType varchar(50) NOT NULL default '',~~ ~~- ValueList varchar(255) default NULL,~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- IsSystem tinyint(3) unsigned NOT NULL default '0',~~ ~~- Required tinyint(1) NOT NULL default '0',~~ ~~- DisplayInGrid tinyint(1) NOT NULL default '1',~~ ~~- DefaultValue text NOT NULL,~~ ~~- Validation TINYINT NOT NULL DEFAULT '0',~~ ~~- PRIMARY KEY (FormFieldId),~~ + FormFieldId int(11) NOT NULL AUTO_INCREMENT, + FormId int(11) NOT NULL DEFAULT '0', + `Type` int(11) NOT NULL DEFAULT '0', + FieldName varchar(255) NOT NULL DEFAULT '', + FieldLabel varchar(255) DEFAULT NULL, + Heading varchar(255) DEFAULT NULL, + Prompt varchar(255) DEFAULT NULL, + ElementType varchar(50) NOT NULL DEFAULT '', + ValueList varchar(255) DEFAULT NULL, + Priority int(11) NOT NULL DEFAULT '0', + IsSystem tinyint(3) unsigned NOT NULL DEFAULT '0', + Required tinyint(1) NOT NULL DEFAULT '0', + DisplayInGrid tinyint(1) NOT NULL DEFAULT '1', + DefaultValue text, + Validation tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (FormFieldId), KEY `Type` (`Type`), KEY FormId (FormId), KEY Priority (Priority), @@ -1062,10 +1062,10 @@ ); CREATE TABLE FormSubmissions ( ~~- FormSubmissionId int(11) NOT NULL auto_increment,~~ ~~- FormId int(11) NOT NULL default '0',~~ ~~- SubmissionTime int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (FormSubmissionId),~~ + FormSubmissionId int(11) NOT NULL AUTO_INCREMENT, + FormId int(11) NOT NULL DEFAULT '0', + SubmissionTime int(11) DEFAULT NULL, + PRIMARY KEY (FormSubmissionId), KEY FormId (FormId), KEY SubmissionTime (SubmissionTime) ); @@ -1078,12 +1078,12 @@ ); CREATE TABLE Semaphores ( ~~- SemaphoreId int(11) NOT NULL auto_increment,~~ ~~- SessionKey int(10) unsigned NOT NULL,~~ ~~- Timestamp int(10) unsigned NOT NULL,~~ ~~- MainPrefix varchar(255) NOT NULL,~~ ~~- PRIMARY KEY (SemaphoreId),~~ + SemaphoreId int(11) NOT NULL AUTO_INCREMENT, + SessionKey int(10) unsigned NOT NULL DEFAULT '0', + `Timestamp` int(10) unsigned NOT NULL DEFAULT '0', + MainPrefix varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (SemaphoreId), KEY SessionKey (SessionKey), ~~- KEY Timestamp (Timestamp),~~ + KEY `Timestamp` (`Timestamp`), KEY MainPrefix (MainPrefix) ); \ No newline at end of file Index: core/install/upgrades.sql =================================================================== --- core/install/upgrades.sql (revision 12650) +++ core/install/upgrades.sql (working copy) @@ -1528,4 +1528,71 @@ CHANGE CachedTemplate CachedTemplate varchar(255) NOT NULL DEFAULT '', CHANGE ThemeId ThemeId int(10) unsigned NOT NULL DEFAULT '0'; ~~-ALTER TABLE UserSession CHANGE BrowserSignature BrowserSignature varchar(32) NOT NULL DEFAULT '';~~ \ No newline at end of file +ALTER TABLE UserSession CHANGE BrowserSignature BrowserSignature varchar(32) NOT NULL DEFAULT ''; + +ALTER TABLE ChangeLogs + CHANGE Changes Changes text NULL, + CHANGE OccuredOn OccuredOn INT(11) NULL DEFAULT NULL; + +ALTER TABLE EmailLog CHANGE EventParams EventParams text NULL; +ALTER TABLE FormFields CHANGE DefaultValue DefaultValue text NULL; +ALTER TABLE ImportCache CHANGE VarValue VarValue text NULL; +ALTER TABLE ImportScripts CHANGE Description Description text NULL; +ALTER TABLE PersistantSessionData CHANGE VariableValue VariableValue text NULL; + +ALTER TABLE Phrase + CHANGE `Translation` `Translation` text NULL, + CHANGE PhraseKey PhraseKey VARCHAR(255) NOT NULL DEFAULT '', + CHANGE LastChanged LastChanged INT(10) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE PhraseCache CHANGE PhraseList PhraseList text NULL; + +ALTER TABLE Stylesheets + CHANGE AdvancedCSS AdvancedCSS text NULL, + CHANGE LastCompiled LastCompiled INT(10) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE StylesheetSelectors + CHANGE SelectorData SelectorData text NULL, + CHANGE Description Description text NULL, + CHANGE AdvancedCSS AdvancedCSS text NULL; + +ALTER TABLE Category + CHANGE `Status` `Status` TINYINT(4) NOT NULL DEFAULT '1', + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL, + CHANGE Modified Modified INT(11) NULL DEFAULT NULL; + +ALTER TABLE Language CHANGE UserDocsUrl UserDocsUrl VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE MailingLists + CHANGE Subject Subject VARCHAR(255) NOT NULL DEFAULT '', + CHANGE EmailsQueued EmailsQueued INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE EmailsSent EmailsSent INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE EmailsTotal EmailsTotal INT(10) UNSIGNED NOT NULL DEFAULT '0'; + +ALTER TABLE EmailQueue + CHANGE MailingId MailingId INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE Queued Queued INT(10) UNSIGNED NULL DEFAULT NULL, + CHANGE LastSendRetry LastSendRetry INT(10) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE ImportScripts CHANGE `Status` `Status` TINYINT(4) NOT NULL DEFAULT '1'; + +ALTER TABLE Semaphores + CHANGE SessionKey SessionKey INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE `Timestamp` `Timestamp` INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE MainPrefix MainPrefix VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE Skins + CHANGE LogoBottom LogoBottom VARCHAR(255) NOT NULL DEFAULT '', + CHANGE LogoLogin LogoLogin VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE ItemReview CHANGE ReviewText ReviewText LONGTEXT NULL; +ALTER TABLE SessionData CHANGE VariableValue VariableValue LONGTEXT NULL; + +ALTER TABLE PortalUser + CHANGE `Status` `Status` TINYINT(4) NOT NULL DEFAULT '1', + CHANGE Modified Modified INT(11) NULL DEFAULT NULL; + +ALTER TABLE ItemFiles CHANGE CreatedOn CreatedOn INT(11) UNSIGNED NULL DEFAULT NULL; +ALTER TABLE FormSubmissions CHANGE SubmissionTime SubmissionTime INT(11) NULL DEFAULT NULL; +ALTER TABLE SessionLogs CHANGE SessionStart SessionStart INT(11) NULL DEFAULT NULL; +ALTER TABLE Visits CHANGE VisitDate VisitDate INT(10) UNSIGNED NULL DEFAULT NULL; \ No newline at end of file Index: core/units/categories/categories_config.php =================================================================== --- core/units/categories/categories_config.php (revision 12650) +++ core/units/categories/categories_config.php (working copy) @@ -294,7 +294,7 @@ 'Filename' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), 'AutomaticFilename' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1), 'Description' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => null), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'EditorsPick' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 1), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0), @@ -311,7 +311,7 @@ 'HotItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'NewItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'PopItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), ~~- 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),~~ + 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => 0), 'CachedTemplate' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), Index: core/units/email_queue/email_queue_config.php =================================================================== --- core/units/email_queue/email_queue_config.php (revision 12650) +++ core/units/email_queue/email_queue_config.php (working copy) @@ -68,9 +68,9 @@ 'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'MessageHeaders' => Array ('type' => 'string', 'default' => NULL), 'MessageBody' => Array ('type' => 'string', 'default' => NULL), ~~- 'Queued' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'Queued' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'SendRetries' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'MailingId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ), Index: core/units/files/files_config.php =================================================================== --- core/units/files/files_config.php (revision 12650) +++ core/units/files/files_config.php (working copy) @@ -78,7 +78,7 @@ ), 'Size' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => '#NOW#'),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'CreatedById' => Array ('type' => 'int', 'not_null' => 1, 'default' => -1), 'MimeType' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), ), Index: core/units/form_fields/form_fields_config.php =================================================================== --- core/units/form_fields/form_fields_config.php (revision 12650) +++ core/units/form_fields/form_fields_config.php (working copy) @@ -74,7 +74,7 @@ 'IsSystem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'Required' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'DisplayInGrid' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), ~~- 'DefaultValue' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'DefaultValue' => Array('type' => 'string', 'default' => NULL), 'Validation' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_None', 1 => 'la_ValidationEmail'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), ), Index: core/units/form_submissions/form_submissions_config.php =================================================================== --- core/units/form_submissions/form_submissions_config.php (revision 12650) +++ core/units/form_submissions/form_submissions_config.php (working copy) @@ -87,7 +87,7 @@ 'Fields' => Array( 'FormSubmissionId' => Array('type' => 'int', 'not_null' => 1,'default' => 0), 'FormId' => Array('type' => 'int','not_null' => '1','default' => 0), ~~- 'SubmissionTime' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#', 'not_null' => '1' ),~~ + 'SubmissionTime' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), ), 'VirtualFields' => Array( ), Index: core/units/logs/change_logs/change_logs_config.php =================================================================== --- core/units/logs/change_logs/change_logs_config.php (revision 12650) +++ core/units/logs/change_logs/change_logs_config.php (working copy) @@ -105,7 +105,7 @@ 'use_phrases' => 1, 'not_null' => 1, 'default' => 0 ), ~~- 'OccuredOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'not_null' => 1, 'default' => 0),~~ + 'OccuredOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'default' => NULL), 'Prefix' => Array ( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT DISTINCT %s FROM '.TABLE_PREFIX.'ChangeLogs ORDER BY Phrase', @@ -115,7 +115,7 @@ 'max_len' => 255, 'not_null' => 1, 'default' => '' ), 'ItemId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'Changes' => Array ('type' => 'string', 'formatter' => 'kChangesFormatter', 'not_null' => 1, 'default' => ''),~~ + 'Changes' => Array ('type' => 'string', 'formatter' => 'kChangesFormatter', 'default' => NULL), 'MasterPrefix' => Array ( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT DISTINCT %s FROM '.TABLE_PREFIX.'ChangeLogs ORDER BY Phrase', Index: core/units/logs/email_logs/email_logs_config.php =================================================================== --- core/units/logs/email_logs/email_logs_config.php (revision 12650) +++ core/units/logs/email_logs/email_logs_config.php (working copy) @@ -69,7 +69,7 @@ 'subject' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), 'timestamp' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'event' => Array ('type' => 'string', 'max_len' => 100, 'default' => NULL), ~~- 'EventParams' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'EventParams' => Array ('type' => 'string', 'default' => NULL), ), 'Grids' => Array ( Index: core/units/logs/session_logs/session_logs_config.php =================================================================== --- core/units/logs/session_logs/session_logs_config.php (revision 12650) +++ core/units/logs/session_logs/session_logs_config.php (working copy) @@ -92,14 +92,14 @@ 'use_phrases' => 1, 'not_null' => 1, 'default' => 1 ), ~~- 'SessionStart' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'time_format' => 'H:i:s', 'default' => 0),~~ + 'SessionStart' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'default' => NULL), 'SessionEnd' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'default' => NULL), 'IP' => Array ('type' => 'string', 'max_len' => 15, 'not_null' => 1, 'default' => ''), 'AffectedItems' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ), 'VirtualFields' => Array( ~~- 'Duration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'date_format' => '', 'time_format' => 'H:i:s', 'use_timezone' => false, 'default' => 0),~~ + 'Duration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'date_format' => '', 'time_format' => 'H:i:s', 'use_timezone' => false, 'default' => NULL), ), 'Grids' => Array ( Index: core/units/phrases/phrases_config.php =================================================================== --- core/units/phrases/phrases_config.php (revision 12650) +++ core/units/phrases/phrases_config.php (working copy) @@ -135,8 +135,8 @@ 'required' => 1, 'unique' => Array ('LanguageId'), 'not_null' => 1, 'default' => '' ), ~~- 'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => NULL),~~ ~~- 'Translation' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), + 'Translation' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'using_fck' => 1, 'default' => NULL), 'PhraseType' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_PhraseType_Front', 1 => 'la_PhraseType_Admin', 2 => 'la_PhraseType_Both'), 'use_phrases' => 1, @@ -150,7 +150,7 @@ 'not_null' => 1, 'default' => 0 ), ~~- 'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'LastChangeIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), 'Module' => Array ( 'type' => 'string', Index: core/units/reviews/reviews_config.php =================================================================== --- core/units/reviews/reviews_config.php (revision 12650) +++ core/units/reviews/reviews_config.php (working copy) @@ -165,7 +165,7 @@ 'Fields' => Array ( 'ReviewId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'CreatedOn' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default'=>'#NOW#'), ~~- 'ReviewText' => Array('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'ReviewText' => Array('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'using_fck' => 1, 'default' => NULL), 'Rating' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_None', 1 => 'lu_Rating_1', 2 => 'lu_Rating_2', 3 => 'lu_Rating_3', 4 => 'lu_Rating_4', 5 => 'lu_Rating_5'), 'use_phrases' => 1, 'min_value_inc' => 0, 'max_value_inc' => 5, 'default' => 0), 'IPAddress' => Array('type'=>'string', 'max_value_inc'=>15, 'not_null'=>1, 'default'=>'', ), 'ItemId' => Array('type'=>'int','not_null'=>1,'default'=>0), Index: core/units/selectors/selectors_config.php =================================================================== --- core/units/selectors/selectors_config.php (revision 12650) +++ core/units/selectors/selectors_config.php (working copy) @@ -105,10 +105,10 @@ 'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'current_table_only' => 1, 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'current_table_only' => 1, 'not_null' => '1','default' => '','required'=>1), ~~- 'SelectorData' => Array('type' => 'string', 'not_null' => '1','default' => ''),~~ ~~- 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'SelectorData' => Array('type' => 'string', 'default' => NULL), + 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), ~~- 'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'required' => 1, 'not_null' => 1, 'default' => 0), ), Index: core/units/structure/structure_config.php =================================================================== --- core/units/structure/structure_config.php (revision 12650) +++ core/units/structure/structure_config.php (working copy) @@ -108,7 +108,7 @@ 'Filename' => Array('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1), 'AutomaticFilename' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), 'Description' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null), ~~- 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1),~~ + 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'EditorsPick' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 1), 'Priority' => Array('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => array(), 'required' => 1, 'default' => 0), @@ -125,7 +125,7 @@ 'HotItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'NewItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'PopItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), ~~- 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),~~ + 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'ModifiedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => 0), 'CachedTemplate' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), @@ -139,7 +139,7 @@ LEFT JOIN ' . TABLE_PREFIX . 'Theme AS t ON t.ThemeId = tf.ThemeId WHERE (t.Enabled = 1) AND (tf.FileName NOT LIKE "%%.elm.tpl") AND (tf.FileName NOT LIKE "%%.des.tpl") AND (tf.FilePath = "/designs")', 'option_key_field' => 'Value', 'option_title_field' => 'Title', ~~- /*'required' => 1,*/ 'default' => null~~ + 'not_null' => 1, 'default' => CATEGORY_TEMPLATE_INHERIT ), 'UseExternalUrl' => Array ( Index: core/units/stylesheets/stylesheets_config.php =================================================================== --- core/units/stylesheets/stylesheets_config.php (revision 12650) +++ core/units/stylesheets/stylesheets_config.php (working copy) @@ -152,8 +152,8 @@ 'StylesheetId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''), ~~- 'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ ~~- 'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'Enabled' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 0), ), Index: core/units/user_profile/user_profile_config.php =================================================================== --- core/units/user_profile/user_profile_config.php (revision 12650) +++ core/units/user_profile/user_profile_config.php (working copy) @@ -44,6 +44,6 @@ 'VariableId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'VariableName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), ~~- 'VariableValue' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'VariableValue' => Array ('type' => 'string', 'default' => NULL), ), ); \ No newline at end of file Index: core/units/users/users_config.php =================================================================== --- core/units/users/users_config.php (revision 12650) +++ core/units/users/users_config.php (working copy) @@ -380,7 +380,7 @@ 'not_null' => '1','default' => ''), 'ResourceId' => Array('type' => 'int','not_null' => 1, 'default' => 0), 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Enabled', 0=>'la_Disabled', 2=>'la_Pending'), 'use_phrases'=>1, 'not_null' => '1','default' => 2), ~~- 'Modified' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1', 'default' => '#NOW#' ),~~ + 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'dob' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => null), 'tz' => Array('type' => 'int','default' => 0), 'ip' => Array('type' => 'string','default' => null), Index: core/units/visits/visits_config.php =================================================================== --- core/units/visits/visits_config.php (revision 12650) +++ core/units/visits/visits_config.php (working copy) @@ -129,7 +129,7 @@ 'Fields' => Array ( 'VisitId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'not_null' => 1, 'default' => 0),~~ + 'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'default' => NULL), 'Referer' => Array ('type' => 'string','not_null' => '1','default' => ''), 'IPAddress' => Array ('type' => 'string','not_null' => '1','default' => ''), 'AffiliateId' => Array ('type' => 'int','formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field' => 'AffiliateId','left_title_field' => 'Login','not_null'=>1,'default'=>0), Index: custom/install/install_schema.sql =================================================================== --- custom/install/install_schema.sql (revision 12650) +++ custom/install/install_schema.sql (working copy) @@ -1,20 +1,20 @@ # place here only sql queries, that were executed on live AND dev sites !!! CREATE TABLE Widgets ( ~~- WidgetId int(11) NOT NULL auto_increment,~~ ~~- Title varchar(255) NOT NULL default '',~~ + WidgetId int(11) NOT NULL AUTO_INCREMENT, + Title varchar(255) NOT NULL DEFAULT '', Description text, ~~- Email varchar(255) NOT NULL default '',~~ ~~- `Type` tinyint(4) NOT NULL default '1',~~ ~~- Phone varchar(50) NOT NULL default '',~~ ~~- Qty double NOT NULL default '0',~~ ~~- `Status` tinyint(4) NOT NULL default '2',~~ ~~- CreatedOn int(11) NOT NULL default '0',~~ ~~- Good tinyint(4) NOT NULL default '0',~~ ~~- BirthTime int(10) unsigned default NULL,~~ ~~- `Image` text,~~ + Email varchar(255) NOT NULL DEFAULT '', + `Type` tinyint(4) NOT NULL DEFAULT '1', + Phone varchar(50) NOT NULL DEFAULT '', + Qty double NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '2', + CreatedOn int(11) DEFAULT NULL, + Good tinyint(4) NOT NULL DEFAULT '0', + BirthTime int(10) unsigned DEFAULT NULL, + Image text, `DataFile` text, ~~- PRIMARY KEY (WidgetId)~~ + PRIMARY KEY (WidgetId) ); # ===== SQLs above this line already on LIVE ================================================================================================ Index: custom/install/upgrades.sql =================================================================== --- custom/install/upgrades.sql (revision 12650) +++ custom/install/upgrades.sql (working copy) @@ -1,4 +1,7 @@ # ===== v 1.0.0 ===== # ===== v 1.0.1 ===== ~~-UPDATE Modules SET LoadOrder = 10 WHERE `Name` = 'Custom';~~ \ No newline at end of file +UPDATE Modules SET LoadOrder = 10 WHERE `Name` = 'Custom'; + +# ===== v 1.0.2 ===== +ALTER TABLE Widgets CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: custom/units/sections/sections_config.php =================================================================== --- custom/units/sections/sections_config.php (revision 12650) +++ custom/units/sections/sections_config.php (working copy) @@ -69,7 +69,7 @@ 'PermSection' => Array ('main' => 'custom', 'email' => 'custom:configuration_email'), # New sections in left navigation - /* + 'Sections' => Array ( 'custom' => Array ( 'parent' => 'in-portal:root', @@ -83,6 +83,4 @@ ), ), ~~- */~~ - ); \ No newline at end of file Index: custom/units/widgets/widgets_config.php =================================================================== --- custom/units/widgets/widgets_config.php (revision 12650) +++ custom/units/widgets/widgets_config.php (working copy) @@ -129,7 +129,7 @@ ), 'CreatedOn' => Array ( 'type' => 'int', 'formatter' => 'kDateFormatter', ~~- 'time_format' => '', 'input_time_format' => '', 'default'=>'#NOW#', 'not_null' => true),~~ + 'time_format' => '', 'input_time_format' => '', 'default'=>'#NOW#', 'default' => NULL), 'Good' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', Index: in-auction/install/install_schema.sql =================================================================== --- in-auction/install/install_schema.sql (revision 12650) +++ in-auction/install/install_schema.sql (working copy) @@ -1,12 +1,12 @@ ALTER TABLE PortalUser ~~- ADD EbayLogin VARCHAR( 255 ) NULL,~~ + ADD EbayLogin VARCHAR(255) NULL, ADD INDEX ( EbayLogin ), ~~- ADD EbayEIASToken VARCHAR( 255 ) NOT NULL,~~ + ADD EbayEIASToken VARCHAR(255) NOT NULL DEFAULT '', ADD INDEX ( EbayEIASToken ); ALTER TABLE Products ~~- ADD LastListingId INT( 11 ) NOT NULL,~~ ~~- ADD ScheduleId INT( 11 ) NOT NULL,~~ + ADD LastListingId INT(11) NOT NULL DEFAULT '0', + ADD ScheduleId INT(11) NOT NULL DEFAULT '0'; ADD INDEX ( ScheduleId ); CREATE TABLE eBayAuctionCategories ( @@ -70,9 +70,9 @@ ); CREATE TABLE eBayCharacteristicsSets ( ~~- `SetId` int(11) NOT NULL default '0',~~ ~~- `XML` longtext NOT NULL,~~ ~~- PRIMARY KEY (`SetId`)~~ + SetId int(11) NOT NULL DEFAULT '0', + XML longtext, + PRIMARY KEY (SetId) ); CREATE TABLE eBayDefaultAttributeValues ( @@ -85,18 +85,18 @@ ); CREATE TABLE eBayErrorLog ( ~~- `LogId` int(11) NOT NULL auto_increment,~~ ~~- `RequestType` varchar(255) NOT NULL default '',~~ ~~- `RequestTime` int(11) NOT NULL default '0',~~ ~~- `DurationSeconds` int(11) default '0',~~ ~~- `AnswerStatus` varchar(255) default '',~~ ~~- `ListingId` int(11) default '0',~~ ~~- `Errors` text NOT NULL,~~ ~~- `Request` text NOT NULL,~~ ~~- `Answer` text NOT NULL,~~ ~~- `AnswerFile` varchar(255) NOT NULL default '',~~ ~~- PRIMARY KEY (`LogId`),~~ ~~- KEY `RequestTime` (`RequestTime`)~~ + LogId int(11) NOT NULL AUTO_INCREMENT, + RequestType varchar(255) NOT NULL DEFAULT '', + RequestTime int(11) DEFAULT NULL, + DurationSeconds int(11) DEFAULT '0', + AnswerStatus varchar(255) DEFAULT '', + ListingId int(11) DEFAULT '0', + `Errors` text, + Request text, + Answer text, + AnswerFile varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (LogId), + KEY RequestTime (RequestTime) ); CREATE TABLE eBayFieldOptions ( @@ -109,71 +109,71 @@ ); CREATE TABLE eBayListingDetailTemplates ( ~~- `DetailTemplateId` int(11) NOT NULL auto_increment,~~ ~~- `TemplateName` varchar(255) NOT NULL default '',~~ ~~- `TemplateBody` text NOT NULL,~~ ~~- PRIMARY KEY (`DetailTemplateId`)~~ + DetailTemplateId int(11) NOT NULL AUTO_INCREMENT, + TemplateName varchar(255) NOT NULL DEFAULT '', + TemplateBody text, + PRIMARY KEY (DetailTemplateId) ); CREATE TABLE eBayListingLog ( ~~- `ListingLogId` int(11) NOT NULL auto_increment,~~ ~~- `ProductListingId` int(11) NOT NULL default '0',~~ ~~- `CreatedOn` int(11) NOT NULL default '0',~~ ~~- `LogData` text NOT NULL,~~ ~~- PRIMARY KEY (`ListingLogId`),~~ ~~- KEY `ProductListingId` (`ProductListingId`),~~ ~~- KEY `CreatedOn` (`CreatedOn`)~~ + ListingLogId int(11) NOT NULL AUTO_INCREMENT, + ProductListingId int(11) NOT NULL DEFAULT '0', + CreatedOn int(11) NOT NULL DEFAULT '0', + LogData text, + PRIMARY KEY (ListingLogId), + KEY ProductListingId (ProductListingId), + KEY CreatedOn (CreatedOn) ); CREATE TABLE eBayListings ( ~~- `ListingId` int(11) NOT NULL auto_increment,~~ ~~- `ProductId` int(11) NOT NULL default '0',~~ ~~- `ListingType` tinyint(1) NOT NULL default '0',~~ ~~- `Status` tinyint(1) NOT NULL default '0',~~ ~~- `eBayListingId` varchar(255) default NULL,~~ ~~- `BidCounter` int(11) NOT NULL default '0',~~ ~~- `DetailTemplateBody` text ,~~ ~~- `ImageUrls` text ,~~ ~~- `UseGallery` tinyint(1) default '0',~~ ~~- `UseGalleryPlus` tinyint(1) default '0',~~ ~~- `CreatedOn` int(11) default '0',~~ ~~- `PaymentMethod` varchar(255) default NULL,~~ ~~- `PayPalSellerEmail` varchar(255) default NULL,~~ ~~- `AutoRelist` tinyint(1) default '0',~~ ~~- `PaymentInstructions` text ,~~ ~~- `OriginalListingId` int(11) NOT NULL default '0',~~ ~~- `Modified` int(11) default '0',~~ ~~- `StoreBuyItNowPrice` double default NULL,~~ ~~- `ListingQuantity` int(11) NOT NULL default '0',~~ ~~- `QuantityPaid` int(11) NOT NULL default '0',~~ ~~- `QuantitySold` int(11) NOT NULL default '0',~~ ~~- `StoreListingDuration` tinyint(2) default NULL,~~ ~~- `SendError` text ,~~ ~~- `AuctionListingDuration` tinyint(2) default NULL,~~ ~~- `AuctionStartPrice` double default NULL,~~ ~~- `AuctionReservePrice` double default NULL,~~ ~~- `AuctionBuyItNowPrice` double default NULL,~~ ~~- `EnhancementBoldTitle` tinyint(1) default NULL,~~ ~~- `EnhancementBorder` tinyint(1) default NULL,~~ ~~- `EnhancementFeatured` tinyint(1) default NULL,~~ ~~- `EnhancementHighlight` tinyint(1) default NULL,~~ ~~- `EnhancementHomePageFeatured` tinyint(1) default NULL,~~ ~~- `Fixed` tinyint(1) default NULL,~~ ~~- `LogId` int(11) default NULL,~~ ~~- `ShippingDetails` text ,~~ ~~- `CurrentPrice` decimal(20,2) default NULL,~~ ~~- `Archived` int(11) NOT NULL default '0',~~ ~~- `RequestParams` longtext NOT NULL,~~ ~~- `ClosedOn` int(11) default NULL,~~ ~~- `ListingFee` decimal(20,2) default NULL,~~ ~~- `Winner` int(11) NOT NULL default '0',~~ ~~- `Hits` INT( 11 ) NOT NULL DEFAULT '0',~~ ~~- PRIMARY KEY (`ListingId`),~~ ~~- KEY `CategoryId` (`ProductId`),~~ ~~- KEY `OriginalListingId` (`OriginalListingId`),~~ ~~- KEY `Archived` (`Archived`),~~ ~~- KEY `Winner` (`Winner`),~~ ~~- KEY `LogId` (`LogId`)~~ + ListingId int(11) NOT NULL AUTO_INCREMENT, + ProductId int(11) NOT NULL DEFAULT '0', + ListingType tinyint(1) NOT NULL DEFAULT '0', + `Status` tinyint(1) NOT NULL DEFAULT '0', + eBayListingId varchar(255) DEFAULT NULL, + BidCounter int(11) NOT NULL DEFAULT '0', + DetailTemplateBody text, + ImageUrls text, + UseGallery tinyint(1) DEFAULT '0', + UseGalleryPlus tinyint(1) DEFAULT '0', + CreatedOn int(11) DEFAULT '0', + PaymentMethod varchar(255) DEFAULT NULL, + PayPalSellerEmail varchar(255) DEFAULT NULL, + AutoRelist tinyint(1) DEFAULT '0', + PaymentInstructions text, + OriginalListingId int(11) NOT NULL DEFAULT '0', + Modified int(11) DEFAULT '0', + StoreBuyItNowPrice double DEFAULT NULL, + ListingQuantity int(11) NOT NULL DEFAULT '0', + QuantityPaid int(11) NOT NULL DEFAULT '0', + QuantitySold int(11) NOT NULL DEFAULT '0', + StoreListingDuration tinyint(2) DEFAULT NULL, + SendError text, + AuctionListingDuration tinyint(2) DEFAULT NULL, + AuctionStartPrice double DEFAULT NULL, + AuctionReservePrice double DEFAULT NULL, + AuctionBuyItNowPrice double DEFAULT NULL, + EnhancementBoldTitle tinyint(1) DEFAULT NULL, + EnhancementBorder tinyint(1) DEFAULT NULL, + EnhancementFeatured tinyint(1) DEFAULT NULL, + EnhancementHighlight tinyint(1) DEFAULT NULL, + EnhancementHomePageFeatured tinyint(1) DEFAULT NULL, + `Fixed` tinyint(1) DEFAULT NULL, + LogId int(11) DEFAULT NULL, + ShippingDetails text, + CurrentPrice decimal(20,2) DEFAULT NULL, + Archived int(11) DEFAULT NULL, + RequestParams longtext, + ClosedOn int(11) DEFAULT NULL, + ListingFee decimal(20,2) DEFAULT NULL, + Winner int(11) NOT NULL DEFAULT '0', + Hits int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (ListingId), + KEY CategoryId (ProductId), + KEY OriginalListingId (OriginalListingId), + KEY Archived (Archived), + KEY Winner (Winner), + KEY LogId (LogId) ); CREATE TABLE eBayOrderItems ( @@ -199,60 +199,60 @@ ); CREATE TABLE eBayProductListings ( ~~- `ProductListingId` int(11) NOT NULL auto_increment,~~ ~~- `ProductId` int(11) NOT NULL default '0',~~ ~~- `SubTitle` varchar(255) default NULL,~~ ~~- `DetailTemplateId` int(11) default NULL,~~ ~~- `UseGallery` tinyint(1) default NULL,~~ ~~- `UseGalleryPlus` tinyint(1) default NULL,~~ ~~- `HitCounter` varchar(255) default NULL,~~ ~~- `AuctionPrimaryCategoryId` int(11) default NULL,~~ ~~- `AuctionSecondaryCategoryId` int(11) default NULL,~~ ~~- `AuctionListingDuration` int(11) default NULL,~~ ~~- `StorePrimaryCategoryId` int(11) default NULL,~~ ~~- `StoreSecondaryCategoryId` int(11) default NULL,~~ ~~- `StoreListingDuration` int(11) default NULL,~~ ~~- `PaymentMethod` varchar(255) default NULL,~~ ~~- `PayPalSellerEmail` varchar(255) default NULL,~~ ~~- `AutoRelist` tinyint(1) default NULL,~~ ~~- `PaymentInstructions` text,~~ ~~- `ListingTitle` varchar(255) default NULL,~~ ~~- `ListingDescription` text,~~ ~~- `AuctionStartPrice` double default NULL,~~ ~~- `AuctionBuyItNowPrice` double default NULL,~~ ~~- `AuctionReservePrice` double default NULL,~~ ~~- `StoreBuyItNowPrice` double default NULL,~~ ~~- `HasReturnPolicy` tinyint(1) default NULL,~~ ~~- `ReturnPolicyDetails` text,~~ ~~- `RefundType` int(11) default NULL,~~ ~~- `ReturnRequestDays` int(11) default NULL,~~ ~~- `InsuranceType` tinyint(1) default NULL,~~ ~~- `InsuranceAmount` double default NULL,~~ ~~- `UseInsurance` varchar(255) default NULL,~~ ~~- `ShippingAsParent` tinyint(1) NOT NULL default '1',~~ ~~- `Images` text NOT NULL,~~ ~~- `GetItFast` tinyint(1) default NULL,~~ ~~- `ItemSpecifics` text,~~ ~~- `CustomItemSpecifics` text,~~ ~~- `BlockScheduling` tinyint(1) NOT NULL default '0',~~ ~~- PRIMARY KEY (`ProductListingId`),~~ ~~- KEY `CategoryId` (`ProductId`)~~ + ProductListingId int(11) NOT NULL AUTO_INCREMENT, + ProductId int(11) NOT NULL DEFAULT '0', + SubTitle varchar(255) DEFAULT NULL, + DetailTemplateId int(11) DEFAULT NULL, + UseGallery tinyint(1) DEFAULT NULL, + UseGalleryPlus tinyint(1) DEFAULT NULL, + HitCounter varchar(255) DEFAULT NULL, + AuctionPrimaryCategoryId int(11) DEFAULT NULL, + AuctionSecondaryCategoryId int(11) DEFAULT NULL, + AuctionListingDuration int(11) DEFAULT NULL, + StorePrimaryCategoryId int(11) DEFAULT NULL, + StoreSecondaryCategoryId int(11) DEFAULT NULL, + StoreListingDuration int(11) DEFAULT NULL, + PaymentMethod varchar(255) DEFAULT NULL, + PayPalSellerEmail varchar(255) DEFAULT NULL, + AutoRelist tinyint(1) DEFAULT NULL, + PaymentInstructions text, + ListingTitle varchar(255) DEFAULT NULL, + ListingDescription text, + AuctionStartPrice double DEFAULT NULL, + AuctionBuyItNowPrice double DEFAULT NULL, + AuctionReservePrice double DEFAULT NULL, + StoreBuyItNowPrice double DEFAULT NULL, + HasReturnPolicy tinyint(1) DEFAULT NULL, + ReturnPolicyDetails text, + RefundType int(11) DEFAULT NULL, + ReturnRequestDays int(11) DEFAULT NULL, + InsuranceType tinyint(1) DEFAULT NULL, + InsuranceAmount double DEFAULT NULL, + UseInsurance varchar(255) DEFAULT NULL, + ShippingAsParent tinyint(1) NOT NULL DEFAULT '1', + Images text, + GetItFast tinyint(1) DEFAULT NULL, + ItemSpecifics text, + CustomItemSpecifics text, + BlockScheduling tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (ProductListingId), + KEY CategoryId (ProductId) ); CREATE TABLE eBaySchedules ( ~~- `ScheduleId` int(11) NOT NULL auto_increment,~~ ~~- `ScheduleName` varchar(255) NOT NULL default '',~~ ~~- `ListingQuantity` int(11) NOT NULL default '1',~~ ~~- `WeekDays` varchar(255) NOT NULL default '',~~ ~~- `StartDate` int(11) NOT NULL default '0',~~ ~~- `StartTime` int(11) NOT NULL default '0',~~ ~~- `EndTime` int(11) NOT NULL default '0',~~ ~~- `ListingType` tinyint(1) NOT NULL default '1',~~ ~~- `ContinueUntilQty` int(11) NOT NULL default '0',~~ ~~- `LastProcessed` int(11) default NULL,~~ ~~- `Status` TINYINT( 1 ) NOT NULL DEFAULT '1',~~ ~~- PRIMARY KEY (`ScheduleId`),~~ ~~- KEY `LastProcessed` (`LastProcessed`)~~ + ScheduleId int(11) NOT NULL AUTO_INCREMENT, + ScheduleName varchar(255) NOT NULL DEFAULT '', + ListingQuantity int(11) NOT NULL DEFAULT '1', + WeekDays varchar(255) NOT NULL DEFAULT '', + StartDate int(11) DEFAULT NULL, + StartTime int(11) DEFAULT NULL, + EndTime int(11) DEFAULT NULL, + ListingType tinyint(1) NOT NULL DEFAULT '1', + ContinueUntilQty int(11) NOT NULL DEFAULT '0', + LastProcessed int(11) DEFAULT NULL, + `Status` tinyint(1) NOT NULL DEFAULT '1', + PRIMARY KEY (ScheduleId), + KEY LastProcessed (LastProcessed) ); CREATE TABLE eBayShipping ( @@ -271,10 +271,10 @@ ); CREATE TABLE eBaySiteWideCharacteristicSets ( ~~- `AttributeSetId` int(11) NOT NULL default '0',~~ ~~- `ExcludeCategoryIds` text NOT NULL,~~ ~~- `Name` varchar(255) NOT NULL default '',~~ ~~- PRIMARY KEY (`AttributeSetId`)~~ + AttributeSetId int(11) NOT NULL DEFAULT '0', + ExcludeCategoryIds text, + `Name` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (AttributeSetId) ); CREATE TABLE eBayStoreCategories ( @@ -286,9 +286,9 @@ ); CREATE TABLE eBayListingHits ( ~~- `ListingId` INT( 11 ) NOT NULL ,~~ ~~- `IP` CHAR( 15 ) NOT NULL ,~~ ~~- `LastHitTime` INT( 11 ) NOT NULL ,~~ ~~- PRIMARY KEY ( `ListingId` , `IP` )~~ + ListingId int(11) NOT NULL, + IP char(15) NOT NULL DEFAULT '', + LastHitTime int(11) DEFAULT NULL, + PRIMARY KEY (ListingId,IP) ); Index: in-auction/install/upgrades.sql =================================================================== --- in-auction/install/upgrades.sql (revision 12650) +++ in-auction/install/upgrades.sql (working copy) @@ -4,4 +4,37 @@ INSERT INTO Permissions VALUES (DEFAULT, 'ebay:setting_folder.view', 11, 1, 1, 0); # ===== v 5.0.1 ===== ~~-ALTER TABLE eBaySchedules CHANGE LastProcessed LastProcessed INT( 11 ) NULL DEFAULT '0';~~ \ No newline at end of file +ALTER TABLE eBaySchedules CHANGE LastProcessed LastProcessed INT( 11 ) NULL DEFAULT '0'; + +# ===== v 5.0.2 ===== +ALTER TABLE eBayErrorLog + CHANGE Errors Errors text NULL, + CHANGE Request Request text NULL, + CHANGE Answer Answer text NULL, + CHANGE RequestTime RequestTime INT(11) NULL DEFAULT NULL; + +ALTER TABLE eBayListingDetailTemplates CHANGE TemplateBody TemplateBody text NULL; +ALTER TABLE eBayListingLog CHANGE LogData LogData text NULL; +ALTER TABLE eBayProductListings CHANGE Images Images text NULL; +ALTER TABLE eBaySiteWideCharacteristicSets CHANGE ExcludeCategoryIds ExcludeCategoryIds text NULL; + +ALTER TABLE eBayListingHits + CHANGE IP IP CHAR(15) NOT NULL DEFAULT '', + CHANGE LastHitTime LastHitTime INT(11) NULL DEFAULT NULL; + +ALTER TABLE PortalUser CHANGE EbayEIASToken EbayEIASToken VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE Products + CHANGE LastListingId LastListingId INT( 11 ) NOT NULL DEFAULT '0', + CHANGE ScheduleId ScheduleId INT( 11 ) NOT NULL DEFAULT '0'; + +ALTER TABLE eBayCharacteristicsSets CHANGE XML XML LONGTEXT NULL; + +ALTER TABLE eBayListings + CHANGE RequestParams RequestParams LONGTEXT NULL, + CHANGE Archived Archived INT(11) NULL DEFAULT NULL; + +ALTER TABLE eBaySchedules + CHANGE StartDate StartDate INT(11) NULL DEFAULT NULL, + CHANGE StartTime StartTime INT(11) NULL DEFAULT NULL, + CHANGE EndTime EndTime INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-auction/units/detail_template/detail_template_config.php =================================================================== --- in-auction/units/detail_template/detail_template_config.php (revision 12650) +++ in-auction/units/detail_template/detail_template_config.php (working copy) @@ -90,7 +90,7 @@ 'Fields' => Array( 'DetailTemplateId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'TemplateName' => Array('type' => 'string','not_null' => '1','default' => '', 'required'=>true,'max_len'=>255), ~~- 'TemplateBody' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => '1', 'using_fck' => 1, 'default' => ''),~~ + 'TemplateBody' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), ), Index: in-auction/units/error_log/error_log_config.php =================================================================== --- in-auction/units/error_log/error_log_config.php (revision 12650) +++ in-auction/units/error_log/error_log_config.php (working copy) @@ -88,13 +88,13 @@ 'Fields' => Array ( 'LogId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'RequestType' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), ~~- 'RequestTime' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kDateFormatter', 'default' => '#NOW#',),~~ + 'RequestTime' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'DurationSeconds' => Array ('type' => 'int', 'default' => 0), 'AnswerStatus' => Array ('type' => 'string', 'default' => ''), 'ListingId' => Array ('type' => 'int', 'default' => 0), ~~- 'Errors' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ ~~- 'Request' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ ~~- 'Answer' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'Errors' => Array ('type' => 'string', 'default' => NULL), + 'Request' => Array ('type' => 'string', 'default' => NULL), + 'Answer' => Array ('type' => 'string', 'default' => NULL), 'AnswerFile' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), ), Index: in-auction/units/listing/listing_config.php =================================================================== --- in-auction/units/listing/listing_config.php (revision 12650) +++ in-auction/units/listing/listing_config.php (working copy) @@ -179,8 +179,8 @@ 'ImageUrls' => Array('type' => 'string', 'default' => null), 'UseGallery' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 0), 'UseGalleryPlus' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 0), ~~- 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#',),~~ ~~- 'Archived' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => 0,),~~ + 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'Archived' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'PaymentMethod' => Array( 'type' => 'string', 'formatter'=>'kOptionsFormatter', @@ -196,7 +196,7 @@ 'AutoRelist' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 0), 'PaymentInstructions' => Array('type' => 'string', 'default' => null), 'OriginalListingId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#',),~~ + 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'ListingQuantity' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'QuantityPaid' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'QuantitySold' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), @@ -236,10 +236,11 @@ 'Fixed' => Array('type' => 'int', 'default' => null), 'LogId' => Array('type' => 'int', 'default' => null), 'ShippingDetails' => Array ('type' => 'string', 'default' => NULL), ~~- 'ClosedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null,),~~ + 'ClosedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), 'ListingFee' => Array('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => null), 'Winner' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Hits' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), + 'RequestParams' => Array ('type' => 'string', 'default' => NULL), ), 'VirtualFields' => Array( Index: in-auction/units/product_listing/product_listing_config.php =================================================================== --- in-auction/units/product_listing/product_listing_config.php (revision 12650) +++ in-auction/units/product_listing/product_listing_config.php (working copy) @@ -241,7 +241,7 @@ 'AutoRelist' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => null), 'PaymentInstructions' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), ~~- 'Images' => Array('type' => 'string', 'not_null'=>1, 'default' => ''),~~ + 'Images' => Array('type' => 'string', 'default' => NULL), 'ListingTitle' => Array('type' => 'string','default' => null), 'ListingDescription' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), 'AuctionStartPrice' => Array('type'=>'float', 'min_value_inc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => null), Index: in-auction/units/schedule/schedule_config.php =================================================================== --- in-auction/units/schedule/schedule_config.php (revision 12650) +++ in-auction/units/schedule/schedule_config.php (working copy) @@ -99,9 +99,9 @@ 6 => 'la_Saturday', 7 => 'la_Sunday', ), 'use_phrases' => true), ~~- 'StartDate' => Array ('type' => 'int', 'not_null' => 1, 'default' => '#NOW#', 'formatter' => 'kDateFormatter', 'format' => 'm/d/y'),~~ ~~- 'StartTime' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'formatter' => 'kDateFormatter', 'input_date_format' => '', 'date_format' => ''),~~ ~~- 'EndTime' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'formatter' => 'kDateFormatter', 'input_date_format' => '', 'date_format' => ''),~~ + 'StartDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'format' => 'm/d/y', 'default' => '#NOW#'), + 'StartTime' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'input_date_format' => '', 'date_format' => '', 'default' => NULL), + 'EndTime' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'input_date_format' => '', 'date_format' => '', 'default' => NULL), 'ListingType' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1, 'required'=>true, 'formatter'=>'kOptionsFormatter', 'options'=>Array( EBAY_LISTING_TYPE_AUCTION => 'la_Auction', EBAY_LISTING_TYPE_STORE => 'la_Store', @@ -109,7 +109,7 @@ 'use_phrases'=>1, ), 'ContinueUntilQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'LastProcessed' => Array ('type' => 'int', 'default' => '', 'formatter' => 'kDateFormatter'),~~ + 'LastProcessed' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'Status' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'formatter'=>'kOptionsFormatter', 'options' => Array( 1 => 'la_Enabled', 0 => 'la_Disabled', Index: in-bulletin/install/install_schema.sql =================================================================== --- in-bulletin/install/install_schema.sql (revision 12650) +++ in-bulletin/install/install_schema.sql (working copy) @@ -1,20 +1,20 @@ CREATE TABLE Posting ( ~~- PostingId int(11) NOT NULL auto_increment,~~ ~~- IPAddress varchar(255) NOT NULL default '',~~ ~~- PosterAlias varchar(255) NOT NULL default '',~~ ~~- Pending tinyint(4) NOT NULL default '0',~~ ~~- Subject varchar(255) default NULL,~~ + PostingId int(11) NOT NULL AUTO_INCREMENT, + IPAddress varchar(255) NOT NULL DEFAULT '', + PosterAlias varchar(255) NOT NULL DEFAULT '', + Pending tinyint(4) NOT NULL DEFAULT '0', + `Subject` varchar(255) DEFAULT NULL, PostingText text, ~~- GraphicsUrl varchar(255) default NULL,~~ ~~- CreatedOn int(11) NOT NULL default '0',~~ ~~- Modified int(11) NOT NULL default '0',~~ ~~- ModifiedById int(11) default NULL,~~ ~~- CreatedById int(11) default NULL,~~ ~~- TopicId int(11) NOT NULL default '0',~~ ~~- ResourceId int(11) NOT NULL default '0',~~ ~~- ReplyTo int(11) NOT NULL default '0',~~ ~~- Options int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (PostingId),~~ + GraphicsUrl varchar(255) DEFAULT NULL, + CreatedOn int(11) DEFAULT NULL, + Modified int(11) DEFAULT NULL, + ModifiedById int(11) DEFAULT NULL, + CreatedById int(11) DEFAULT NULL, + TopicId int(11) NOT NULL DEFAULT '0', + ResourceId int(11) NOT NULL DEFAULT '0', + ReplyTo int(11) NOT NULL DEFAULT '0', + `Options` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (PostingId), KEY TopicId (TopicId), KEY Pending (Pending), KEY CreatedById (CreatedById), @@ -24,44 +24,44 @@ ); CREATE TABLE Topic ( ~~- TopicId int(11) NOT NULL auto_increment,~~ ~~- NotifyOwnerOnChanges tinyint(4) NOT NULL default '0',~~ ~~- Modified int(11) NOT NULL default '0',~~ ~~- TopicText varchar(255) NOT NULL default '',~~ ~~- AutomaticFilename tinyint(3) unsigned NOT NULL default '1',~~ ~~- Posts int(11) NOT NULL default '0',~~ ~~- Views double(20,6) NOT NULL default '0',~~ ~~- EditorsPick tinyint(4) NOT NULL default '0',~~ ~~- Status tinyint(4) unsigned NOT NULL default '2',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- OwnerId int(11) NOT NULL default '-1',~~ ~~- ModifiedById int(11) NOT NULL default '0',~~ ~~- ResourceId int(11) default NULL,~~ ~~- TopicType int(11) NOT NULL default '1',~~ ~~- CreatedOn int(11) NOT NULL default '0',~~ ~~- CachedReviewsQty int(11) NOT NULL default '0',~~ ~~- CachedRating VARCHAR(10) NOT NULL DEFAULT '0',~~ ~~- CachedVotesQty int(11) NOT NULL default '0',~~ ~~- NewItem tinyint(4) NOT NULL default '2',~~ ~~- PopItem tinyint(4) NOT NULL default '2',~~ ~~- HotItem tinyint(4) NOT NULL default '2',~~ ~~- PostedBy varchar(255) NOT NULL default '',~~ ~~- OrgId INT(11) NULL DEFAULT NULL,~~ ~~- LastPostId int(11) NOT NULL default '0',~~ ~~- LastPostDate INT(11) NULL DEFAULT NULL,~~ ~~- TodayDate DATE NULL DEFAULT NULL,~~ ~~- TodayPosts int(11) NOT NULL default '0',~~ + TopicId int(11) NOT NULL AUTO_INCREMENT, + NotifyOwnerOnChanges tinyint(4) NOT NULL DEFAULT '0', + Modified int(11) DEFAULT NULL, + TopicText varchar(255) NOT NULL DEFAULT '', + AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1', + Posts int(11) NOT NULL DEFAULT '0', + Views double(20,6) NOT NULL DEFAULT '0.000000', + EditorsPick tinyint(4) NOT NULL DEFAULT '0', + `Status` tinyint(4) unsigned NOT NULL DEFAULT '2', + Priority int(11) NOT NULL DEFAULT '0', + OwnerId int(11) NOT NULL DEFAULT '-1', + ModifiedById int(11) NOT NULL DEFAULT '0', + ResourceId int(11) DEFAULT NULL, + TopicType int(11) NOT NULL DEFAULT '1', + CreatedOn int(11) DEFAULT NULL, + CachedReviewsQty int(11) NOT NULL DEFAULT '0', + CachedRating varchar(10) NOT NULL DEFAULT '0', + CachedVotesQty int(11) NOT NULL DEFAULT '0', + NewItem tinyint(4) NOT NULL DEFAULT '2', + PopItem tinyint(4) NOT NULL DEFAULT '2', + HotItem tinyint(4) NOT NULL DEFAULT '2', + PostedBy varchar(255) NOT NULL DEFAULT '', + OrgId int(11) DEFAULT NULL, + LastPostId int(11) NOT NULL DEFAULT '0', + LastPostDate int(11) DEFAULT NULL, + TodayDate date DEFAULT NULL, + TodayPosts int(11) NOT NULL DEFAULT '0', MetaKeywords varchar(255) DEFAULT NULL, ~~- MetaDescription text NULL DEFAULT NULL,~~ ~~- PRIMARY KEY (TopicId),~~ + MetaDescription text, + PRIMARY KEY (TopicId), + UNIQUE KEY ResourceId (ResourceId), KEY OwnerId (OwnerId), ~~- UNIQUE KEY ResourceId (ResourceId),~~ KEY ModifiedById (ModifiedById), KEY Posts (Posts), KEY Modified (Modified), KEY Views (Views), KEY EditorsPick (EditorsPick), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY Priority (Priority), KEY CreatedOn (CreatedOn), KEY NewItem (NewItem), @@ -78,35 +78,35 @@ ); CREATE TABLE Emoticon ( ~~- EmoticonId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(20) NOT NULL default '',~~ ~~- KeyStroke varchar(20) NOT NULL default '',~~ ~~- Enabled int(11) NOT NULL default '1',~~ ~~- EmotionImage VARCHAR(255) NOT NULL,~~ ~~- PRIMARY KEY (EmoticonId),~~ + EmoticonId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(20) NOT NULL DEFAULT '', + KeyStroke varchar(20) NOT NULL DEFAULT '', + Enabled int(11) NOT NULL DEFAULT '1', + EmotionImage varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (EmoticonId), KEY Enabled (Enabled), KEY EmotionImage (EmotionImage) ); CREATE TABLE PrivateMessageBody ( ~~- PMBodyId int(11) unsigned NOT NULL auto_increment,~~ ~~- Subject varchar(255) NOT NULL default '',~~ ~~- Body text NOT NULL,~~ ~~- Options tinyint(3) unsigned NOT NULL default '0',~~ ~~- ReferenceCount smallint(5) unsigned NOT NULL default '2',~~ ~~- PRIMARY KEY (PMBodyId),~~ + PMBodyId int(11) unsigned NOT NULL AUTO_INCREMENT, + `Subject` varchar(255) NOT NULL DEFAULT '', + Body text, + `Options` tinyint(3) unsigned NOT NULL DEFAULT '0', + ReferenceCount smallint(5) unsigned NOT NULL DEFAULT '2', + PRIMARY KEY (PMBodyId), KEY ReferenceCount (ReferenceCount) ); CREATE TABLE PrivateMessages ( ~~- PmId int(11) unsigned NOT NULL auto_increment,~~ ~~- FromId int(11) unsigned default NULL,~~ ~~- ToId int(11) unsigned default NULL,~~ ~~- FolderId tinyint(3) NOT NULL default '-1',~~ ~~- `Status` tinyint(1) unsigned NOT NULL default '0',~~ ~~- PMBodyId int(11) unsigned NOT NULL default '0',~~ ~~- CreatedOn int(11) unsigned NOT NULL default '0',~~ ~~- PRIMARY KEY (PmId),~~ + PmId int(11) unsigned NOT NULL AUTO_INCREMENT, + FromId int(11) unsigned DEFAULT NULL, + ToId int(11) unsigned DEFAULT NULL, + FolderId tinyint(3) NOT NULL DEFAULT '-1', + `Status` tinyint(1) unsigned NOT NULL DEFAULT '0', + PMBodyId int(11) unsigned NOT NULL DEFAULT '0', + CreatedOn int(11) unsigned DEFAULT NULL, + PRIMARY KEY (PmId), KEY FromId (FromId), KEY CreatedOn (CreatedOn), KEY ToId (ToId), @@ -121,24 +121,24 @@ ); CREATE TABLE Polls ( ~~- PollId int(11) NOT NULL auto_increment,~~ ~~- `Name` varchar(255) NOT NULL default '',~~ + PollId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', l1_Question text, l2_Question text, l3_Question text, l4_Question text, l5_Question text, ~~- Image varchar(255) NOT NULL default '',~~ ~~- CreatedOn int(11) unsigned NOT NULL,~~ ~~- StartDate int(11) unsigned NOT NULL,~~ ~~- EndDate int(11) unsigned default NULL,~~ ~~- Priority tinyint(4) NOT NULL default '0',~~ ~~- RequireLogin tinyint(4) NOT NULL default '0',~~ ~~- AllowMultipleVotings tinyint(4) NOT NULL default '1',~~ ~~- AllowComments tinyint(4) NOT NULL default '1',~~ ~~- `Status` tinyint(4) NOT NULL default '1',~~ ~~- CachedVotesQty int(11) NOT NULL,~~ ~~- PRIMARY KEY (PollId),~~ + Image varchar(255) NOT NULL DEFAULT '', + CreatedOn int(11) unsigned DEFAULT NULL, + StartDate int(11) unsigned DEFAULT NULL, + EndDate int(11) unsigned DEFAULT NULL, + Priority tinyint(4) NOT NULL DEFAULT '0', + RequireLogin tinyint(4) NOT NULL DEFAULT '0', + AllowMultipleVotings tinyint(4) NOT NULL DEFAULT '1', + AllowComments tinyint(4) NOT NULL DEFAULT '1', + `Status` tinyint(4) NOT NULL DEFAULT '1', + CachedVotesQty int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (PollId), KEY `Status` (`Status`), KEY Priority (Priority), KEY StartDate (StartDate), @@ -146,36 +146,36 @@ ); CREATE TABLE PollsAnswers ( ~~- AnswerId int(11) NOT NULL auto_increment,~~ ~~- PollId int(11) NOT NULL,~~ + AnswerId int(11) NOT NULL AUTO_INCREMENT, + PollId int(11) NOT NULL DEFAULT '0', l1_Answer text, l2_Answer text, l3_Answer text, l4_Answer text, l5_Answer text, ~~- VotesQty int(11) NOT NULL,~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- Status tinyint(4) NOT NULL default '1',~~ ~~- PRIMARY KEY (AnswerId),~~ ~~- KEY Status (Status),~~ + VotesQty int(11) NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + PRIMARY KEY (AnswerId), + KEY `Status` (`Status`), KEY Priority (Priority), KEY VoteCount (VotesQty), KEY PollId (PollId) ); CREATE TABLE PollsComments ( ~~- CommentId int(11) NOT NULL auto_increment,~~ ~~- PollId int(11) NOT NULL,~~ ~~- AnswerId int(11) default NULL,~~ ~~- CreatedById int(11) NOT NULL default '-2',~~ ~~- GuestName varchar(255) NOT NULL,~~ ~~- GuestEmail varchar(255) NOT NULL,~~ + CommentId int(11) NOT NULL AUTO_INCREMENT, + PollId int(11) NOT NULL DEFAULT '0', + AnswerId int(11) DEFAULT NULL, + CreatedById int(11) NOT NULL DEFAULT '-2', + GuestName varchar(255) NOT NULL DEFAULT '', + GuestEmail varchar(255) NOT NULL DEFAULT '', CommentBody text, ~~- CreatedOn int(11) NOT NULL,~~ ~~- UserIP varchar(255) NOT NULL,~~ ~~- Priority int(11) NOT NULL,~~ ~~- `Status` tinyint(4) NOT NULL default '1',~~ ~~- PRIMARY KEY (CommentId),~~ + CreatedOn int(11) DEFAULT NULL, + UserIP varchar(255) NOT NULL DEFAULT '', + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + PRIMARY KEY (CommentId), KEY `Status` (`Status`), KEY Priority (Priority), KEY CreatedOn (CreatedOn), @@ -185,13 +185,13 @@ ); CREATE TABLE PollsStatistics ( ~~- StatisticsId int(11) NOT NULL auto_increment,~~ ~~- PollId int(11) NOT NULL default '0',~~ ~~- AnswerId int(11) NOT NULL default '0',~~ ~~- CreatedById int(11) NOT NULL default '-2',~~ ~~- UserIP varchar(255) NOT NULL,~~ ~~- AnswerDate int(10) unsigned default NULL,~~ ~~- PRIMARY KEY (StatisticsId),~~ + StatisticsId int(11) NOT NULL AUTO_INCREMENT, + PollId int(11) NOT NULL DEFAULT '0', + AnswerId int(11) NOT NULL DEFAULT '0', + CreatedById int(11) NOT NULL DEFAULT '-2', + UserIP varchar(255) NOT NULL DEFAULT '', + AnswerDate int(10) unsigned DEFAULT NULL, + PRIMARY KEY (StatisticsId), KEY AnswerId (AnswerId,PollId), KEY CreatedById (CreatedById), KEY UserIP (UserIP) Index: in-bulletin/install/upgrades.sql =================================================================== --- in-bulletin/install/upgrades.sql (revision 12650) +++ in-bulletin/install/upgrades.sql (working copy) @@ -127,4 +127,38 @@ INSERT INTO Events VALUES(DEFAULT, 'TOPIC.MODIFY.PENDING', NULL, 1, 1, NULL, 'In-Bulletin', 'la_event_topic.modify.pending', 0); INSERT INTO Events VALUES(DEFAULT, 'TOPIC.APPROVE', NULL, 1, 0, NULL, 'In-Bulletin', 'la_event_topic.approve', 0); ~~-UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('topic_ReviewDelay_Value', 'topic_RatingDelay_Value', 'poll_CommentDelay_Value');~~ \ No newline at end of file +UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('topic_ReviewDelay_Value', 'topic_RatingDelay_Value', 'poll_CommentDelay_Value'); + +# ===== v 5.0.2 ===== +ALTER TABLE PrivateMessageBody CHANGE Body Body text NULL; + +ALTER TABLE Emoticon CHANGE EmotionImage EmotionImage VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE Polls + CHANGE CreatedOn CreatedOn INT(11) UNSIGNED NULL DEFAULT NULL , + CHANGE StartDate StartDate INT(11) UNSIGNED NULL DEFAULT NULL , + CHANGE CachedVotesQty CachedVotesQty INT(11) NOT NULL DEFAULT '0'; + +ALTER TABLE PollsAnswers + CHANGE PollId PollId INT(11) NOT NULL DEFAULT '0', + CHANGE VotesQty VotesQty INT(11) NOT NULL DEFAULT '0'; + +ALTER TABLE PollsComments + CHANGE PollId PollId INT(11) NOT NULL DEFAULT '0', + CHANGE GuestName GuestName VARCHAR(255) NOT NULL DEFAULT '', + CHANGE GuestEmail GuestEmail VARCHAR(255) NOT NULL DEFAULT '', + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL , + CHANGE UserIP UserIP VARCHAR(255) NOT NULL DEFAULT '', + CHANGE Priority Priority INT(11) NOT NULL DEFAULT '0'; + +ALTER TABLE PollsStatistics CHANGE UserIP UserIP VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE Posting + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL, + CHANGE Modified Modified INT(11) NULL DEFAULT NULL; + +ALTER TABLE PrivateMessages CHANGE CreatedOn CreatedOn INT(11) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE Topic + CHANGE Modified Modified INT(11) NULL DEFAULT NULL, + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-bulletin/units/poll_comments/poll_comments_config.php =================================================================== --- in-bulletin/units/poll_comments/poll_comments_config.php (revision 12650) +++ in-bulletin/units/poll_comments/poll_comments_config.php (working copy) @@ -67,7 +67,7 @@ 'GuestName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'GuestEmail' => Array('type' => 'string', 'max_len' => 255, 'formatter'=>'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'not_null' => '1', 'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!'),'required' => 0 ), 'CommentBody' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL, 'required' => 1), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1, 'default' => '#NOW#'),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'UserIP' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Active', 0 => 'la_opt_Disabled', 2 => 'la_opt_Pending'), 'use_phrases' => 1, 'required' => 1, 'not_null' => 1, 'default' => 1), Index: in-bulletin/units/polls/polls_config.php =================================================================== --- in-bulletin/units/polls/polls_config.php (revision 12650) +++ in-bulletin/units/polls/polls_config.php (working copy) @@ -103,8 +103,8 @@ 'PollId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'Name' => Array('type' => 'string', 'not_null' => '1','default' => '', 'required'=> 1, 'max_len' => 255), 'Question' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => null, 'required' => 1), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1, 'default' => '#NOW#'),~~ ~~- 'StartDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1, 'default' => '#NOW#'),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), + 'StartDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'EndDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), 'Image' => Array ( 'type' => 'string', Index: in-bulletin/units/posts/posts_config.php =================================================================== --- in-bulletin/units/posts/posts_config.php (revision 12650) +++ in-bulletin/units/posts/posts_config.php (working copy) @@ -83,8 +83,8 @@ 'Subject' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), 'PostingText' => Array ('type' => 'string', 'allow_html' => 1, 'default' => NULL), 'GraphicsUrl' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ ~~- 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL), 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL), 'TopicId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), Index: in-bulletin/units/private_message_body/private_message_body_config.php =================================================================== --- in-bulletin/units/private_message_body/private_message_body_config.php (revision 12650) +++ in-bulletin/units/private_message_body/private_message_body_config.php (working copy) @@ -46,7 +46,7 @@ 'Fields' => Array ( 'PMBodyId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), ~~- 'Body' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'Body' => Array ('type' => 'string', 'default' => NULL), 'Options' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'ReferenceCount' => Array ('type' => 'int', 'not_null' => 1, 'default' => 2), ), Index: in-bulletin/units/private_messages/private_messages_config.php =================================================================== --- in-bulletin/units/private_messages/private_messages_config.php (revision 12650) +++ in-bulletin/units/private_messages/private_messages_config.php (working copy) @@ -90,7 +90,7 @@ 'FolderId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_Inbox', 1 => 'lu_Sent'), 'use_phrases' => 1, 'not_null' => 1, 'default' => PM_FOLDER_SENT), 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_opt_MessageUnread', 1 => 'lu_opt_MessageViewed', 2 => 'lu_opt_MessageRead', 3 => 'lu_opt_MessageReplied', 4 => 'lu_opt_MessageSent'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'PMBodyId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => '#NOW#'),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), ), 'VirtualFields' => Array ( Index: in-bulletin/units/topics/topics_config.php =================================================================== --- in-bulletin/units/topics/topics_config.php (revision 12650) +++ in-bulletin/units/topics/topics_config.php (working copy) @@ -298,7 +298,7 @@ 'Fields' => Array ( 'TopicId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'NotifyOwnerOnChanges' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_No', 1 => 'lu_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), ~~- 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1, 'default' => '#NOW#'),~~ + 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'TopicText' => Array('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''), 'AutomaticFilename' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), 'Posts' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), @@ -310,7 +310,7 @@ 'ModifiedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'default' => 0), 'ResourceId' => Array('type' => 'int', 'default' => null), 'TopicType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Yes', 1 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), ~~- 'CreatedOn' => Array('type' => 'double', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#', 'not_null' => 1),~~ + 'CreatedOn' => Array('type' => 'double', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'CachedReviewsQty' => Array('type' => 'int' ,'not_null' => 1, 'default' => 0), 'CachedRating' => Array('type' => 'string', 'not_null' => 1, 'default' => 0), 'CachedVotesQty' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), Index: in-commerce/install/install_schema.sql =================================================================== --- in-commerce/install/install_schema.sql (revision 12650) +++ in-commerce/install/install_schema.sql (working copy) @@ -23,30 +23,30 @@ ); CREATE TABLE Currencies ( ~~- CurrencyId int(11) NOT NULL auto_increment,~~ ~~- ISO char(3) NOT NULL default '',~~ ~~- Symbol varchar(255) default NULL,~~ ~~- SymbolPosition tinyint(4) default NULL,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- RateToPrimary double NOT NULL default '1',~~ ~~- Modified int(11) NOT NULL default '0',~~ ~~- Status smallint(6) NOT NULL default '0',~~ ~~- IsPrimary smallint(6) NOT NULL default '0',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (CurrencyId),~~ + CurrencyId int(11) NOT NULL AUTO_INCREMENT, + ISO char(3) NOT NULL DEFAULT '', + Symbol varchar(255) DEFAULT NULL, + SymbolPosition tinyint(4) DEFAULT NULL, + `Name` varchar(255) NOT NULL DEFAULT '', + RateToPrimary double NOT NULL DEFAULT '1', + Modified int(11) DEFAULT NULL, + `Status` smallint(6) NOT NULL DEFAULT '1', + IsPrimary smallint(6) NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (CurrencyId), KEY Priority (Priority), KEY IsPrimary (IsPrimary), KEY Modified (Modified) ); CREATE TABLE GatewayConfigFields ( ~~- GWConfigFieldId int(11) NOT NULL auto_increment,~~ ~~- SystemFieldName varchar(50) NOT NULL default '',~~ ~~- FieldName varchar(100) NOT NULL default '',~~ ~~- ElementType varchar(30) NOT NULL default 'text',~~ ~~- ValueList mediumtext NOT NULL,~~ ~~- GatewayId int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (GWConfigFieldId),~~ + GWConfigFieldId int(11) NOT NULL AUTO_INCREMENT, + SystemFieldName varchar(50) NOT NULL DEFAULT '', + FieldName varchar(100) NOT NULL DEFAULT '', + ElementType varchar(30) NOT NULL DEFAULT 'text', + ValueList mediumtext, + GatewayId int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (GWConfigFieldId), KEY GatewayId (GatewayId) ); @@ -70,22 +70,22 @@ ); CREATE TABLE Manufacturers ( ~~- ManufacturerId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- Description text NOT NULL,~~ ~~- URL varchar(255) NOT NULL default '',~~ ~~- Logo varchar(255) NOT NULL default '',~~ ~~- IsPopular int(10) unsigned NOT NULL default '0',~~ ~~- Address1 varchar(255) default NULL,~~ ~~- Address2 varchar(255) default NULL,~~ ~~- City varchar(255) default NULL,~~ ~~- State varchar(50) default NULL,~~ ~~- Zip varchar(50) default NULL,~~ ~~- Country varchar(255) default NULL,~~ ~~- Phone varchar(50) default NULL,~~ ~~- Fax varchar(50) default NULL,~~ ~~- Email varchar(255) default NULL,~~ ~~- PRIMARY KEY (ManufacturerId)~~ + ManufacturerId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + Description text, + URL varchar(255) NOT NULL DEFAULT '', + Logo varchar(255) NOT NULL DEFAULT '', + IsPopular int(10) unsigned NOT NULL DEFAULT '0', + Address1 varchar(255) DEFAULT NULL, + Address2 varchar(255) DEFAULT NULL, + City varchar(255) DEFAULT NULL, + State varchar(50) DEFAULT NULL, + Zip varchar(50) DEFAULT NULL, + Country varchar(255) DEFAULT NULL, + Phone varchar(50) DEFAULT NULL, + Fax varchar(50) DEFAULT NULL, + Email varchar(255) DEFAULT NULL, + PRIMARY KEY (ManufacturerId) ); CREATE TABLE OrderItems ( @@ -122,79 +122,79 @@ ); CREATE TABLE Orders ( ~~- OrderId int(11) NOT NULL auto_increment,~~ ~~- Number mediumint(9) NOT NULL default '0',~~ ~~- SubNumber smallint(6) NOT NULL default '0',~~ ~~- `Status` tinyint(3) unsigned NOT NULL default '0',~~ ~~- OnHold tinyint(3) unsigned NOT NULL default '0',~~ ~~- OrderDate int(10) unsigned NOT NULL default '0',~~ ~~- PortalUserId int(11) NOT NULL default '-1',~~ ~~- OrderIP varchar(30) NOT NULL default '',~~ ~~- UserComment text NOT NULL,~~ ~~- AdminComment text NOT NULL,~~ ~~- BillingTo varchar(255) NOT NULL default '',~~ ~~- BillingCompany varchar(255) NOT NULL default '',~~ ~~- BillingPhone varchar(255) NOT NULL default '',~~ ~~- BillingFax varchar(255) NOT NULL default '',~~ ~~- BillingEmail varchar(255) NOT NULL default '',~~ ~~- BillingAddress1 varchar(255) NOT NULL default '',~~ ~~- BillingAddress2 varchar(255) NOT NULL default '',~~ ~~- BillingCity varchar(255) NOT NULL default '',~~ ~~- BillingState varchar(255) NOT NULL default '',~~ ~~- BillingZip varchar(255) NOT NULL default '',~~ ~~- BillingCountry varchar(255) NOT NULL default 'USA',~~ ~~- VAT decimal(20,4) NOT NULL default '0.0000',~~ ~~- VATPercent decimal(20,4) NOT NULL default '0.0000',~~ ~~- PaymentType tinyint(3) unsigned NOT NULL default '0',~~ ~~- PaymentAccount varchar(255) NOT NULL default '',~~ ~~- PaymentExpires int(10) unsigned NOT NULL default '0',~~ ~~- PaymentNameOnCard varchar(255) NOT NULL default '',~~ ~~- PaymentCCExpDate varchar(5) NOT NULL default '',~~ ~~- PaymentCardType varchar(255) NOT NULL default '',~~ ~~- ShippingTo varchar(255) NOT NULL default '',~~ ~~- ShippingCompany varchar(255) NOT NULL default '',~~ ~~- ShippingPhone varchar(255) NOT NULL default '',~~ ~~- ShippingFax varchar(255) NOT NULL default '',~~ ~~- ShippingEmail varchar(255) NOT NULL default '',~~ ~~- ShippingAddress1 varchar(255) NOT NULL default '',~~ ~~- ShippingAddress2 varchar(255) NOT NULL default '',~~ ~~- ShippingCity varchar(255) NOT NULL default '',~~ ~~- ShippingState varchar(255) NOT NULL default '',~~ ~~- ShippingZip varchar(255) NOT NULL default '',~~ ~~- ShippingCountry varchar(255) NOT NULL default 'USA',~~ ~~- ShippingType int(11) NOT NULL default '0',~~ ~~- ShippingCost decimal(20,4) NOT NULL default '0.0000',~~ ~~- ShippingCustomerAccount varchar(255) NOT NULL default '',~~ ~~- ShippingTracking varchar(255) NOT NULL default '',~~ ~~- ShippingDate int(11) default NULL,~~ ~~- SubTotal decimal(20,4) unsigned NOT NULL default '0.0000',~~ ~~- ReturnTotal decimal(20,4) NOT NULL default '0.0000',~~ ~~- CostTotal decimal(20,4) NOT NULL default '0.0000',~~ ~~- OriginalAmount decimal(20,4) NOT NULL default '0.0000',~~ ~~- ShippingOption tinyint(4) default NULL,~~ + OrderId int(11) NOT NULL AUTO_INCREMENT, + Number mediumint(9) NOT NULL DEFAULT '0', + SubNumber smallint(6) NOT NULL DEFAULT '0', + `Status` tinyint(3) unsigned NOT NULL DEFAULT '0', + OnHold tinyint(3) unsigned NOT NULL DEFAULT '0', + OrderDate int(10) unsigned DEFAULT NULL, + PortalUserId int(11) NOT NULL DEFAULT '-1', + OrderIP varchar(30) NOT NULL DEFAULT '', + UserComment text, + AdminComment text, + BillingTo varchar(255) NOT NULL DEFAULT '', + BillingCompany varchar(255) NOT NULL DEFAULT '', + BillingPhone varchar(255) NOT NULL DEFAULT '', + BillingFax varchar(255) NOT NULL DEFAULT '', + BillingEmail varchar(255) NOT NULL DEFAULT '', + BillingAddress1 varchar(255) NOT NULL DEFAULT '', + BillingAddress2 varchar(255) NOT NULL DEFAULT '', + BillingCity varchar(255) NOT NULL DEFAULT '', + BillingState varchar(255) NOT NULL DEFAULT '', + BillingZip varchar(255) NOT NULL DEFAULT '', + BillingCountry varchar(255) NOT NULL DEFAULT 'USA', + VAT decimal(20,4) NOT NULL DEFAULT '0.0000', + VATPercent decimal(20,4) NOT NULL DEFAULT '0.0000', + PaymentType tinyint(3) unsigned NOT NULL DEFAULT '0', + PaymentAccount varchar(255) NOT NULL DEFAULT '', + PaymentExpires int(10) unsigned DEFAULT NULL, + PaymentNameOnCard varchar(255) NOT NULL DEFAULT '', + PaymentCCExpDate varchar(5) NOT NULL DEFAULT '', + PaymentCardType varchar(255) NOT NULL DEFAULT '', + ShippingTo varchar(255) NOT NULL DEFAULT '', + ShippingCompany varchar(255) NOT NULL DEFAULT '', + ShippingPhone varchar(255) NOT NULL DEFAULT '', + ShippingFax varchar(255) NOT NULL DEFAULT '', + ShippingEmail varchar(255) NOT NULL DEFAULT '', + ShippingAddress1 varchar(255) NOT NULL DEFAULT '', + ShippingAddress2 varchar(255) NOT NULL DEFAULT '', + ShippingCity varchar(255) NOT NULL DEFAULT '', + ShippingState varchar(255) NOT NULL DEFAULT '', + ShippingZip varchar(255) NOT NULL DEFAULT '', + ShippingCountry varchar(255) NOT NULL DEFAULT 'USA', + ShippingType int(11) NOT NULL DEFAULT '0', + ShippingCost decimal(20,4) NOT NULL DEFAULT '0.0000', + ShippingCustomerAccount varchar(255) NOT NULL DEFAULT '', + ShippingTracking varchar(255) NOT NULL DEFAULT '', + ShippingDate int(11) DEFAULT NULL, + SubTotal decimal(20,4) unsigned NOT NULL DEFAULT '0.0000', + ReturnTotal decimal(20,4) NOT NULL DEFAULT '0.0000', + CostTotal decimal(20,4) NOT NULL DEFAULT '0.0000', + OriginalAmount decimal(20,4) NOT NULL DEFAULT '0.0000', + ShippingOption tinyint(4) DEFAULT NULL, ShippingInfo text, ~~- CouponId int(11) default NULL,~~ ~~- CouponDiscount decimal(20,4) NOT NULL default '0.0000',~~ ~~- DiscountTotal decimal(10,4) NOT NULL default '0.0000',~~ ~~- TransactionStatus tinyint(3) unsigned NOT NULL default '2',~~ ~~- GWResult1 mediumtext NOT NULL,~~ ~~- GWResult2 mediumtext NOT NULL,~~ ~~- AffiliateId int(10) unsigned NOT NULL default '0',~~ ~~- VisitId int(10) unsigned NOT NULL default '0',~~ ~~- AffiliateCommission decimal(10,4) NOT NULL default '0.0000',~~ ~~- ProcessingFee decimal(20,4) default '0.0000',~~ ~~- InsuranceFee decimal(20,4) NOT NULL default '0.0000',~~ ~~- ShippingTaxable tinyint(1) NOT NULL default '0',~~ ~~- ProcessingTaxable tinyint(1) NOT NULL default '0',~~ ~~- IsRecurringBilling tinyint(4) NOT NULL default '0',~~ ~~- NextCharge int(10) unsigned default NULL,~~ ~~- GroupId int(10) unsigned NOT NULL default '0',~~ ~~- ChargeOnNextApprove tinyint(4) NOT NULL default '0',~~ ~~- ShippingGroupOption tinyint(4) NOT NULL default '0',~~ ~~- GiftCertificateId int(11) default NULL,~~ ~~- GiftCertificateDiscount decimal(20,4) NOT NULL default '0.0000',~~ ~~- GoogleOrderNumber bigint(20) unsigned default NULL,~~ ~~- PRIMARY KEY (OrderId),~~ + CouponId int(11) DEFAULT NULL, + CouponDiscount decimal(20,4) NOT NULL DEFAULT '0.0000', + DiscountTotal decimal(10,4) NOT NULL DEFAULT '0.0000', + TransactionStatus tinyint(3) unsigned NOT NULL DEFAULT '2', + GWResult1 mediumtext, + GWResult2 mediumtext, + AffiliateId int(10) unsigned NOT NULL DEFAULT '0', + VisitId int(10) unsigned NOT NULL DEFAULT '0', + AffiliateCommission decimal(10,4) NOT NULL DEFAULT '0.0000', + ProcessingFee decimal(20,4) DEFAULT '0.0000', + InsuranceFee decimal(20,4) NOT NULL DEFAULT '0.0000', + ShippingTaxable tinyint(1) NOT NULL DEFAULT '0', + ProcessingTaxable tinyint(1) NOT NULL DEFAULT '0', + IsRecurringBilling tinyint(4) NOT NULL DEFAULT '0', + NextCharge int(10) unsigned DEFAULT NULL, + GroupId int(10) unsigned NOT NULL DEFAULT '0', + ChargeOnNextApprove tinyint(4) NOT NULL DEFAULT '0', + ShippingGroupOption tinyint(4) NOT NULL DEFAULT '0', + GiftCertificateId int(11) DEFAULT NULL, + GiftCertificateDiscount decimal(20,4) NOT NULL DEFAULT '0.0000', + GoogleOrderNumber bigint(20) unsigned DEFAULT NULL, + PRIMARY KEY (OrderId), KEY AffiliateId (AffiliateId), KEY VisitId (VisitId), KEY GoogleOrderNumber (GoogleOrderNumber), @@ -209,30 +209,30 @@ ); CREATE TABLE GiftCertificates ( ~~- GiftCertificateId int(11) NOT NULL auto_increment,~~ ~~- OrderId int(11) default '0',~~ ~~- Purchaser varchar(64) default NULL,~~ ~~- Recipient varchar(64) default NULL,~~ ~~- SendVia tinyint(1) NOT NULL default '0',~~ ~~- RecipientEmail varchar(64) NOT NULL default '',~~ ~~- RecipientFirstname varchar(128) default NULL,~~ ~~- RecipientLastname varchar(128) default NULL,~~ ~~- RecipientAddress1 varchar(255) default NULL,~~ ~~- RecipientAddress2 varchar(255) default NULL,~~ ~~- RecipientCity varchar(64) default NULL,~~ ~~- RecipientState varchar(32) default NULL,~~ ~~- RecipientZipcode varchar(32) default NULL,~~ ~~- RecipientCountry char(3) NOT NULL default 'USA',~~ ~~- RecipientPhone varchar(32) default NULL,~~ + GiftCertificateId int(11) NOT NULL AUTO_INCREMENT, + OrderId int(11) DEFAULT '0', + Purchaser varchar(64) DEFAULT NULL, + Recipient varchar(64) DEFAULT NULL, + SendVia tinyint(1) NOT NULL DEFAULT '0', + RecipientEmail varchar(64) NOT NULL DEFAULT '', + RecipientFirstname varchar(128) DEFAULT NULL, + RecipientLastname varchar(128) DEFAULT NULL, + RecipientAddress1 varchar(255) DEFAULT NULL, + RecipientAddress2 varchar(255) DEFAULT NULL, + RecipientCity varchar(64) DEFAULT NULL, + RecipientState varchar(32) DEFAULT NULL, + RecipientZipcode varchar(32) DEFAULT NULL, + RecipientCountry char(3) NOT NULL DEFAULT 'USA', + RecipientPhone varchar(32) DEFAULT NULL, Message text, ~~- Amount decimal(12,2) default '0.00',~~ ~~- Debit decimal(12,2) default '0.00',~~ ~~- `Status` tinyint(1) NOT NULL default '1',~~ ~~- AddDate int(11) default '0',~~ ~~- Expiration int(11) default NULL,~~ ~~- Code varchar(255) default NULL,~~ ~~- PRIMARY KEY (GiftCertificateId),~~ ~~- UNIQUE KEY Code (Code),~~ + Amount decimal(12,2) DEFAULT '0.00', + Debit decimal(12,2) DEFAULT '0.00', + `Status` tinyint(1) NOT NULL DEFAULT '2', + AddDate int(11) DEFAULT '0', + Expiration int(11) DEFAULT NULL, + `Code` varchar(255) DEFAULT NULL, + PRIMARY KEY (GiftCertificateId), + UNIQUE KEY `Code` (`Code`), KEY OrderId (OrderId), KEY `Status` (`Status`), KEY AddDate (AddDate) @@ -248,21 +248,21 @@ ); CREATE TABLE PaymentTypes ( ~~- PaymentTypeId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(100) NOT NULL default '',~~ ~~- Description varchar(255) default NULL,~~ + PaymentTypeId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(100) NOT NULL DEFAULT '', + Description varchar(255) DEFAULT NULL, Instructions text, AdminComments text, ~~- Status int(11) NOT NULL default '0',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- IsPrimary tinyint(4) NOT NULL default '0',~~ ~~- BuiltIn smallint(6) NOT NULL default '0',~~ ~~- GatewayId int(11) NOT NULL default '1',~~ ~~- PlacedOrdersEdit tinyint(4) NOT NULL default '0',~~ ~~- ProcessingFee DOUBLE NOT NULL DEFAULT '0',~~ ~~- PortalGroups TEXT NOT NULL,~~ ~~- PRIMARY KEY (PaymentTypeId),~~ ~~- KEY Status (Status),~~ + `Status` int(11) NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + IsPrimary tinyint(4) NOT NULL DEFAULT '0', + BuiltIn smallint(6) NOT NULL DEFAULT '0', + GatewayId int(11) NOT NULL DEFAULT '1', + PlacedOrdersEdit tinyint(4) NOT NULL DEFAULT '0', + ProcessingFee double NOT NULL DEFAULT '0', + PortalGroups text, + PRIMARY KEY (PaymentTypeId), + KEY `Status` (`Status`), KEY Priority (Priority), KEY GatewayId (GatewayId), KEY BuiltIn (BuiltIn), @@ -270,16 +270,16 @@ ); CREATE TABLE Products ( ~~- ProductId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) default '',~~ ~~- l1_Name varchar(255) default NULL,~~ ~~- l2_Name varchar(255) default NULL,~~ ~~- l3_Name varchar(255) default NULL,~~ ~~- l4_Name varchar(255) default NULL,~~ ~~- l5_Name varchar(255) default NULL,~~ ~~- AutomaticFilename tinyint(3) unsigned NOT NULL default '1',~~ ~~- SKU varchar(255) default NULL,~~ ~~- `Type` tinyint(2) unsigned NOT NULL default '1',~~ + ProductId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) DEFAULT '', + l1_Name varchar(255) DEFAULT NULL, + l2_Name varchar(255) DEFAULT NULL, + l3_Name varchar(255) DEFAULT NULL, + l4_Name varchar(255) DEFAULT NULL, + l5_Name varchar(255) DEFAULT NULL, + AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1', + SKU varchar(255) DEFAULT NULL, + `Type` tinyint(2) unsigned NOT NULL DEFAULT '1', Description text, l1_Description text, l2_Description text, @@ -292,57 +292,57 @@ l3_DescriptionExcerpt text, l4_DescriptionExcerpt text, l5_DescriptionExcerpt text, ~~- Weight double(10,4) default NULL,~~ ~~- ManufacturerId int(11) NOT NULL default '0',~~ ~~- MSRP double default NULL,~~ ~~- BackOrder tinyint(3) unsigned NOT NULL default '2',~~ ~~- BackOrderDate int(11) default NULL,~~ ~~- CreatedOn int(10) unsigned default NULL,~~ ~~- Modified int(10) unsigned default NULL,~~ ~~- Expire int(10) unsigned default NULL,~~ ~~- Hits double NOT NULL default '0',~~ ~~- CachedRating decimal(11,10) NOT NULL default '0.0000000000',~~ ~~- CachedVotesQty int(11) NOT NULL default '0',~~ ~~- CachedReviewsQty int(11) NOT NULL default '0',~~ ~~- CreatedById int(11) NOT NULL default '0',~~ ~~- ModifiedById int(11) NOT NULL default '0',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- `Status` tinyint(4) NOT NULL default '2',~~ ~~- EditorsPick tinyint(4) NOT NULL default '0',~~ ~~- Featured tinyint(4) NOT NULL default '0',~~ ~~- OnSale tinyint(1) NOT NULL default '0',~~ ~~- ResourceId int(11) default NULL,~~ ~~- HotItem tinyint(4) NOT NULL default '2',~~ ~~- PopItem tinyint(4) NOT NULL default '2',~~ ~~- NewItem tinyint(4) NOT NULL default '2',~~ ~~- InventoryStatus tinyint(4) NOT NULL default '0',~~ ~~- QtyInStock int(11) NOT NULL default '0',~~ ~~- QtyInStockMin int(11) NOT NULL default '0',~~ ~~- QtyReserved int(11) NOT NULL default '0',~~ ~~- QtyBackOrdered int(11) NOT NULL default '0',~~ ~~- QtyOnOrder int(11) NOT NULL default '0',~~ + Weight double(10,4) DEFAULT NULL, + ManufacturerId int(11) NOT NULL DEFAULT '0', + MSRP double DEFAULT NULL, + BackOrder tinyint(3) unsigned NOT NULL DEFAULT '2', + BackOrderDate int(11) DEFAULT NULL, + CreatedOn int(10) unsigned DEFAULT NULL, + Modified int(10) unsigned DEFAULT NULL, + Expire int(10) unsigned DEFAULT NULL, + Hits double NOT NULL DEFAULT '0', + CachedRating decimal(11,10) NOT NULL DEFAULT '0.0000000000', + CachedVotesQty int(11) NOT NULL DEFAULT '0', + CachedReviewsQty int(11) NOT NULL DEFAULT '0', + CreatedById int(11) NOT NULL DEFAULT '0', + ModifiedById int(11) NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '2', + EditorsPick tinyint(4) NOT NULL DEFAULT '0', + Featured tinyint(4) NOT NULL DEFAULT '0', + OnSale tinyint(1) NOT NULL DEFAULT '0', + ResourceId int(11) DEFAULT NULL, + HotItem tinyint(4) NOT NULL DEFAULT '2', + PopItem tinyint(4) NOT NULL DEFAULT '2', + NewItem tinyint(4) NOT NULL DEFAULT '2', + InventoryStatus tinyint(4) NOT NULL DEFAULT '0', + QtyInStock int(11) NOT NULL DEFAULT '0', + QtyInStockMin int(11) NOT NULL DEFAULT '0', + QtyReserved int(11) NOT NULL DEFAULT '0', + QtyBackOrdered int(11) NOT NULL DEFAULT '0', + QtyOnOrder int(11) NOT NULL DEFAULT '0', InventoryComment text, ~~- AccessGroupId int(11) default NULL,~~ ~~- AccessDuration int(11) default NULL,~~ ~~- AccessDurationType tinyint(4) default NULL,~~ ~~- AccessStart int(11) default NULL,~~ ~~- AccessEnd int(11) default NULL,~~ ~~- Virtual tinyint(4) NOT NULL default '0',~~ + AccessGroupId int(11) DEFAULT NULL, + AccessDuration int(11) DEFAULT NULL, + AccessDurationType tinyint(4) DEFAULT NULL, + AccessStart int(11) DEFAULT NULL, + AccessEnd int(11) DEFAULT NULL, + Virtual tinyint(4) NOT NULL DEFAULT '0', ProcessingData text, PackageContent mediumtext NOT NULL, ~~- OptionsSelectionMode tinyint(4) default '0',~~ ~~- HasRequiredOptions tinyint(1) NOT NULL default '0',~~ ~~- IsRecurringBilling tinyint(3) unsigned NOT NULL default '0',~~ ~~- ShippingMode tinyint(1) NOT NULL default '0',~~ ~~- ShippingLimitation text NOT NULL,~~ ~~- AssignedCoupon int(11) NOT NULL default '0',~~ ~~- MinQtyFreePromoShipping int(11) NOT NULL default '0',~~ ~~- MetaKeywords varchar(255) default NULL,~~ + OptionsSelectionMode tinyint(4) DEFAULT '0', + HasRequiredOptions tinyint(1) NOT NULL DEFAULT '0', + IsRecurringBilling tinyint(3) unsigned NOT NULL DEFAULT '0', + ShippingMode tinyint(1) NOT NULL DEFAULT '0', + ShippingLimitation text, + AssignedCoupon int(11) NOT NULL DEFAULT '0', + MinQtyFreePromoShipping int(11) NOT NULL DEFAULT '0', + MetaKeywords varchar(255) DEFAULT NULL, MetaDescription text, ~~- PRIMARY KEY (ProductId),~~ + PRIMARY KEY (ProductId), KEY ResourceId (ResourceId), KEY Hits (Hits), ~~- KEY Name (Name),~~ + KEY `Name` (`Name`), KEY EditorsPick (EditorsPick), KEY CreatedOn (CreatedOn), KEY Modified (Modified,CreatedOn), @@ -433,47 +433,47 @@ ); CREATE TABLE ProductFiles ( ~~- FileId INT NOT NULL AUTO_INCREMENT,~~ ~~- ProductId INT NOT NULL,~~ ~~- Name VARCHAR(255) NOT NULL,~~ ~~- Version VARCHAR(100) NOT NULL,~~ ~~- FilePath VARCHAR(255) NOT NULL,~~ ~~- RealPath VARCHAR(255) NOT NULL,~~ ~~- Size INT NOT NULL,~~ ~~- Status tinyint(4) NOT NULL default '0',~~ ~~- IsPrimary tinyint(4) NOT NULL default '0',~~ ~~- Priority smallint(6) NOT NULL default '0',~~ ~~- AddedOn int(11) NOT NULL default '0',~~ ~~- AddedById int(11) NOT NULL default '0',~~ ~~- MIMEType varchar(255) NOT NULL default '',~~ + FileId int(11) NOT NULL AUTO_INCREMENT, + ProductId int(11) NOT NULL DEFAULT '0', + `Name` varchar(255) NOT NULL DEFAULT '', + Version varchar(100) NOT NULL DEFAULT '', + FilePath varchar(255) NOT NULL DEFAULT '', + RealPath varchar(255) NOT NULL DEFAULT '', + Size int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '0', + IsPrimary tinyint(4) NOT NULL DEFAULT '0', + Priority smallint(6) NOT NULL DEFAULT '0', + AddedOn int(11) DEFAULT NULL, + AddedById int(11) NOT NULL DEFAULT '0', + MIMEType varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (FileId), KEY ProductId (ProductId), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY IsPrimary (IsPrimary), KEY Priority (Priority), KEY AddedOn (AddedOn) ); CREATE TABLE UserFileAccess ( ~~- FileAccessId INT NOT NULL AUTO_INCREMENT,~~ ~~- ProductId INT NOT NULL,~~ ~~- PortalUserId INT NOT NULL,~~ + FileAccessId int(11) NOT NULL AUTO_INCREMENT, + ProductId int(11) NOT NULL DEFAULT '0', + PortalUserId int(11) NOT NULL DEFAULT '0', PRIMARY KEY (FileAccessId), KEY ProductId (ProductId), KEY PortalUserId (PortalUserId) ); CREATE TABLE UserDownloads ( ~~- DownloadId int(11) NOT NULL auto_increment,~~ ~~- PortalUserId int(11) NOT NULL default '0',~~ ~~- Username varchar(255) NOT NULL default '',~~ ~~- ProductId int(11) NOT NULL default '0',~~ ~~- ProductName varchar(255) NOT NULL default '',~~ ~~- FileId int(11) NOT NULL default '0',~~ ~~- Filename varchar(255) NOT NULL default '',~~ ~~- IPAddress varchar(100) NOT NULL default '',~~ ~~- StartedOn int(11) NOT NULL default '0',~~ ~~- EndedOn int(11) NOT NULL default '0',~~ + DownloadId int(11) NOT NULL AUTO_INCREMENT, + PortalUserId int(11) NOT NULL DEFAULT '0', + Username varchar(255) NOT NULL DEFAULT '', + ProductId int(11) NOT NULL DEFAULT '0', + ProductName varchar(255) NOT NULL DEFAULT '', + FileId int(11) NOT NULL DEFAULT '0', + Filename varchar(255) NOT NULL DEFAULT '', + IPAddress varchar(100) NOT NULL DEFAULT '', + StartedOn int(11) DEFAULT NULL, + EndedOn int(11) DEFAULT NULL, PRIMARY KEY (DownloadId), KEY PortalUserId (PortalUserId), KEY ProductId (ProductId) @@ -502,40 +502,40 @@ ); CREATE TABLE ShippingQuoteEngines ( ~~- EngineId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- FlatSurcharge double NOT NULL default '0',~~ ~~- PercentSurcharge double NOT NULL default '0',~~ ~~- Status smallint(6) NOT NULL default '0',~~ ~~- Properties text NOT NULL,~~ ~~- ClassName varchar(255) NOT NULL default '',~~ + EngineId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + FlatSurcharge double NOT NULL DEFAULT '0', + PercentSurcharge double NOT NULL DEFAULT '0', + `Status` smallint(6) NOT NULL DEFAULT '0', + Properties text, + ClassName varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (EngineId), ~~- KEY Status (Status)~~ + KEY `Status` (`Status`) ); CREATE TABLE ShippingType ( ~~- ShippingID int(11) NOT NULL auto_increment,~~ ~~- Code varchar(25) NOT NULL default '',~~ ~~- Name varchar(100) NOT NULL default '',~~ ~~- SpeedCode varchar(25) NOT NULL default '',~~ ~~- LocationFrom int(11) NOT NULL default '1',~~ ~~- `Type` int(11) NOT NULL default '1',~~ ~~- BaseFee double NOT NULL default '0',~~ ~~- CODFlatSurcharge double NOT NULL default '0',~~ ~~- CODPercentSurcharge double NOT NULL default '0',~~ ~~- `Status` tinyint(4) NOT NULL default '1',~~ ~~- CostType tinyint(4) NOT NULL default '1',~~ ~~- ZeroIfEmpty tinyint(4) NOT NULL default '1',~~ ~~- PrecisionBeforeSep tinyint(4) NOT NULL default '2',~~ ~~- PrecisionAfterSep tinyint(4) NOT NULL default '2',~~ ~~- PortalGroups text NOT NULL,~~ ~~- FreeShippingMinAmount double(10,4) NOT NULL default '0.0000',~~ ~~- IsFreePromoShipping tinyint(1) NOT NULL default '0',~~ ~~- InsuranceFee decimal(10,2) default NULL,~~ ~~- InsuranceType tinyint(1) NOT NULL default '2',~~ ~~- PRIMARY KEY (ShippingID),~~ + ShippingID int(11) NOT NULL AUTO_INCREMENT, + `Code` varchar(25) NOT NULL DEFAULT '', + `Name` varchar(100) NOT NULL DEFAULT '', + SpeedCode varchar(25) NOT NULL DEFAULT '', + LocationFrom int(11) NOT NULL DEFAULT '1', + `Type` int(11) NOT NULL DEFAULT '1', + BaseFee double NOT NULL DEFAULT '0', + CODFlatSurcharge double NOT NULL DEFAULT '0', + CODPercentSurcharge double NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + CostType tinyint(4) NOT NULL DEFAULT '1', + ZeroIfEmpty tinyint(4) NOT NULL DEFAULT '1', + PrecisionBeforeSep tinyint(4) NOT NULL DEFAULT '2', + PrecisionAfterSep tinyint(4) NOT NULL DEFAULT '2', + PortalGroups text, + FreeShippingMinAmount double(10,4) NOT NULL DEFAULT '0.0000', + IsFreePromoShipping tinyint(1) NOT NULL DEFAULT '0', + InsuranceFee decimal(10,2) DEFAULT NULL, + InsuranceType tinyint(1) NOT NULL DEFAULT '2', + PRIMARY KEY (ShippingID), KEY `Type` (`Type`), ~~- KEY Status (Status)~~ + KEY `Status` (`Status`) ); CREATE TABLE ShippingZones ( @@ -580,29 +580,29 @@ ); CREATE TABLE AffiliatePayments ( ~~- AffiliatePaymentId int(11) NOT NULL auto_increment,~~ ~~- AffiliateId int(10) unsigned NOT NULL default '0',~~ ~~- PaymentDate int(10) unsigned NOT NULL default '0',~~ ~~- Amount decimal(10,2) NOT NULL default '0.00',~~ ~~- Comment text NOT NULL,~~ ~~- PaymentReference varchar(255) NOT NULL default '',~~ ~~- PaymentTypeId int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (AffiliatePaymentId),~~ + AffiliatePaymentId int(11) NOT NULL AUTO_INCREMENT, + AffiliateId int(10) unsigned NOT NULL DEFAULT '0', + PaymentDate int(10) unsigned DEFAULT NULL, + Amount decimal(10,2) NOT NULL DEFAULT '0.00', + `Comment` text, + PaymentReference varchar(255) NOT NULL DEFAULT '', + PaymentTypeId int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (AffiliatePaymentId), KEY AffiliateId (AffiliateId), KEY PaymentDate (PaymentDate), KEY PaymentTypeId (PaymentTypeId) ); CREATE TABLE AffiliatePaymentTypes ( ~~- PaymentTypeId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- Description text NOT NULL,~~ ~~- IsPrimary tinyint(4) NOT NULL default '0',~~ ~~- Status tinyint(4) NOT NULL default '0',~~ ~~- Priority tinyint(4) NOT NULL default '0',~~ ~~- PRIMARY KEY (PaymentTypeId),~~ + PaymentTypeId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + Description text, + IsPrimary tinyint(4) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '0', + Priority tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (PaymentTypeId), KEY IsPrimary (IsPrimary), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY Priority (Priority) ); @@ -643,47 +643,47 @@ ); CREATE TABLE Affiliates ( ~~- AffiliateId int(11) NOT NULL auto_increment,~~ ~~- PortalUserId int(10) unsigned NOT NULL default '0',~~ ~~- AffiliatePlanId int(10) unsigned NOT NULL default '0',~~ ~~- AccumulatedAmount decimal(10,2) NOT NULL default '0.00',~~ ~~- AmountToPay decimal(10,2) NOT NULL default '0.00',~~ ~~- LastPaymentDate INT(11) UNSIGNED NULL DEFAULT NULL,~~ ~~- LastOrderDate INT(11) UNSIGNED NULL DEFAULT NULL,~~ ~~- Status tinyint(4) NOT NULL default '2',~~ ~~- AffiliateCode varchar(30) NOT NULL default '',~~ ~~- ItemsSold int(10) unsigned NOT NULL default '0',~~ ~~- PaymentTypeId int(11) NOT NULL default '0',~~ ~~- SSN varchar(100) NOT NULL default '',~~ ~~- Comments text NOT NULL,~~ ~~- CreatedOn int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (AffiliateId),~~ + AffiliateId int(11) NOT NULL AUTO_INCREMENT, + PortalUserId int(10) unsigned NOT NULL DEFAULT '0', + AffiliatePlanId int(10) unsigned NOT NULL DEFAULT '0', + AccumulatedAmount decimal(10,2) NOT NULL DEFAULT '0.00', + AmountToPay decimal(10,2) NOT NULL DEFAULT '0.00', + LastPaymentDate int(11) unsigned DEFAULT NULL, + LastOrderDate int(11) unsigned DEFAULT NULL, + `Status` tinyint(4) NOT NULL DEFAULT '2', + AffiliateCode varchar(30) NOT NULL DEFAULT '', + ItemsSold int(10) unsigned NOT NULL DEFAULT '0', + PaymentTypeId int(11) NOT NULL DEFAULT '0', + SSN varchar(100) NOT NULL DEFAULT '', + Comments text, + CreatedOn int(11) DEFAULT NULL, + PRIMARY KEY (AffiliateId), UNIQUE KEY PortalUserId (PortalUserId), UNIQUE KEY AffiliateCode (AffiliateCode), KEY LastOrderDate (LastOrderDate), KEY AffiliatePlanId (AffiliatePlanId), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY PaymentTypeId (PaymentTypeId), KEY CreatedOn (CreatedOn) ); CREATE TABLE ProductOptionCombinations ( ~~- CombinationId int(11) NOT NULL auto_increment,~~ ~~- ProductId int(11) NOT NULL default '0',~~ ~~- Combination text NOT NULL,~~ ~~- CombinationCRC int(11) NOT NULL default '0',~~ ~~- PriceType tinyint(1) default '3',~~ ~~- Price float default NULL,~~ ~~- WeightType tinyint(1) default '3',~~ ~~- Weight float default NULL,~~ ~~- Availability tinyint(1) NOT NULL default '1',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- QtyInStock int(11) NOT NULL default '0',~~ ~~- QtyReserved int(11) NOT NULL default '0',~~ ~~- QtyBackOrdered int(11) NOT NULL default '0',~~ ~~- QtyOnOrder int(11) NOT NULL default '0',~~ ~~- SKU varchar(255) NOT NULL default '',~~ ~~- PRIMARY KEY (CombinationId),~~ + CombinationId int(11) NOT NULL AUTO_INCREMENT, + ProductId int(11) NOT NULL DEFAULT '0', + Combination text, + CombinationCRC int(11) NOT NULL DEFAULT '0', + PriceType tinyint(1) DEFAULT '3', + Price float DEFAULT NULL, + WeightType tinyint(1) DEFAULT '3', + Weight float DEFAULT NULL, + Availability tinyint(1) NOT NULL DEFAULT '1', + Priority int(11) NOT NULL DEFAULT '0', + QtyInStock int(11) NOT NULL DEFAULT '0', + QtyReserved int(11) NOT NULL DEFAULT '0', + QtyBackOrdered int(11) NOT NULL DEFAULT '0', + QtyOnOrder int(11) NOT NULL DEFAULT '0', + SKU varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (CombinationId), KEY CombinationCRC (CombinationCRC), KEY ProductId (ProductId), KEY Availability (Availability) Index: in-commerce/install/upgrades.sql =================================================================== --- in-commerce/install/upgrades.sql (revision 12650) +++ in-commerce/install/upgrades.sql (working copy) @@ -57,4 +57,60 @@ UPDATE Events SET Type = 1 WHERE Event = 'BACKORDER.FULLFILL'; ~~-UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('product_RatingDelay_Value', 'product_ReviewDelay_Value');~~ \ No newline at end of file +UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('product_RatingDelay_Value', 'product_ReviewDelay_Value'); + +# ===== v 5.0.2 ===== +ALTER TABLE AffiliatePayments + CHANGE Comment Comment text NULL, + CHANGE PaymentDate PaymentDate INT(10) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE AffiliatePaymentTypes CHANGE Description Description text NULL; + +ALTER TABLE Affiliates + CHANGE Comments Comments text NULL, + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL; + +ALTER TABLE Manufacturers CHANGE Description Description text NULL; + +ALTER TABLE Orders + CHANGE UserComment UserComment text NULL, + CHANGE AdminComment AdminComment text NULL, + CHANGE GWResult1 GWResult1 MEDIUMTEXT NULL, + CHANGE GWResult2 GWResult2 MEDIUMTEXT NULL, + CHANGE OrderDate OrderDate INT(10) UNSIGNED NULL DEFAULT NULL, + CHANGE PaymentExpires PaymentExpires INT(10) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE PaymentTypes CHANGE PortalGroups PortalGroups text NULL; +ALTER TABLE ProductOptionCombinations CHANGE Combination Combination text NULL; + +ALTER TABLE Products + CHANGE ShippingLimitation ShippingLimitation text NULL, + CHANGE PackageContent PackageContent MEDIUMTEXT NULL; + +ALTER TABLE ShippingQuoteEngines CHANGE Properties Properties text NULL; +ALTER TABLE ShippingType CHANGE PortalGroups PortalGroups text NULL; + +ALTER TABLE ProductFiles + CHANGE ProductId ProductId INT(11) NOT NULL DEFAULT '0', + CHANGE `Name` `Name` VARCHAR(255) NOT NULL DEFAULT '', + CHANGE Version Version VARCHAR(100) NOT NULL DEFAULT '', + CHANGE FilePath FilePath VARCHAR(255) NOT NULL DEFAULT '', + CHANGE RealPath RealPath VARCHAR(255) NOT NULL DEFAULT '', + CHANGE Size Size INT(11) NOT NULL DEFAULT '0', + CHANGE AddedOn AddedOn INT(11) NULL DEFAULT NULL; + +ALTER TABLE UserFileAccess + CHANGE ProductId ProductId INT( 11 ) NOT NULL DEFAULT '0', + CHANGE PortalUserId PortalUserId INT( 11 ) NOT NULL DEFAULT '0'; + +ALTER TABLE GatewayConfigFields CHANGE ValueList ValueList MEDIUMTEXT NULL; + +ALTER TABLE Currencies + CHANGE `Status` `Status` SMALLINT(6) NOT NULL DEFAULT '1', + CHANGE Modified Modified INT(11) NULL DEFAULT NULL; + +ALTER TABLE GiftCertificates CHANGE `Status` `Status` TINYINT(1) NOT NULL DEFAULT '2'; + +ALTER TABLE UserDownloads + CHANGE StartedOn StartedOn INT(11) NULL DEFAULT NULL, + CHANGE EndedOn EndedOn INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-commerce/units/affiliate_payment_types/affiliate_payment_types_config.php =================================================================== --- in-commerce/units/affiliate_payment_types/affiliate_payment_types_config.php (revision 12650) +++ in-commerce/units/affiliate_payment_types/affiliate_payment_types_config.php (working copy) @@ -82,7 +82,7 @@ 'Fields' => Array( 'PaymentTypeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''), ~~- 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'IsPrimary' => Array('type' => 'int','not_null' => 1, 'default' => 0), 'Status' => Array('type' => 'int','not_null' => 1, 'default' => 0), 'Priority' => Array('type' => 'int','not_null' => 1, 'default' => 0), Index: in-commerce/units/affiliate_payments/affiliate_payments_config.php =================================================================== --- in-commerce/units/affiliate_payments/affiliate_payments_config.php (revision 12650) +++ in-commerce/units/affiliate_payments/affiliate_payments_config.php (working copy) @@ -109,9 +109,9 @@ 'Fields' => Array( 'AffiliatePaymentId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'), 'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0), ~~- 'PaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1','default' => '#NOW#'),~~ + 'PaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default' => '#NOW#'), 'Amount' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1', 'required'=>1, 'default' => '0.00'), ~~- 'Comment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'Comment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'PaymentReference' => Array('type' => 'string','not_null' => '1','default' => ''), 'PaymentTypeId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options_sql'=>'SELECT Name, PaymentTypeId FROM '.TABLE_PREFIX.'AffiliatePaymentTypes WHERE Status = 1 ORDER BY IsPrimary DESC, Priority DESC, Name ASC', 'option_key_field'=>'PaymentTypeId', 'option_title_field'=>'Name', 'not_null' => 1, 'default' => 0), ), Index: in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php =================================================================== --- in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php (revision 12650) +++ in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php (working copy) @@ -88,8 +88,8 @@ 'ItemName' => Array(), 'SKU' => Array(), 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f'), ~~- 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#' ),~~ ~~- 'BackOrderDate' => Array('formatter' => 'kDateFormatter'),~~ + 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'BackOrderDate' => Array('formatter' => 'kDateFormatter', 'default' => NULL), ), 'Grids' => Array( Index: in-commerce/units/affiliates/affiliates_config.php =================================================================== --- in-commerce/units/affiliates/affiliates_config.php (revision 12650) +++ in-commerce/units/affiliates/affiliates_config.php (working copy) @@ -168,15 +168,15 @@ 'AffiliatePlanId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options_sql'=>'SELECT Name, AffiliatePlanId FROM '.TABLE_PREFIX.'AffiliatePlans WHERE Enabled = 1 ORDER BY Name', 'option_key_field'=>'AffiliatePlanId', 'option_title_field'=>'Name', 'not_null' => 1, 'default' => 0), 'AccumulatedAmount' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1','default' => '0.00'), 'AmountToPay' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1','default' => '0.00'), ~~- 'LastPaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default' => null),~~ ~~- 'LastOrderDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),~~ + 'LastPaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default' => NULL), + 'LastOrderDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Active', 2=>'la_Pending', 0=>'la_Disabled'), 'use_phrases'=>1, 'not_null' => '1','default' => 2), 'AffiliateCode' => Array('type' => 'string', 'not_null' => '1', 'default' => ''), 'ItemsSold' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'PaymentTypeId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(0 => ''), 'options_sql'=>'SELECT Name, PaymentTypeId FROM '.TABLE_PREFIX.'AffiliatePaymentTypes WHERE Status = 1 ORDER BY IsPrimary DESC, Priority DESC, Name ASC', 'option_key_field'=>'PaymentTypeId', 'option_title_field'=>'Name', 'not_null' => 1, 'default' => 0), 'SSN' => Array('type' => 'string','not_null' => '1','default' => '', 'required' => 1), ~~- 'Comments' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ ~~- 'CreatedOn' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1', 'default' => '#NOW#'),~~ + 'Comments' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), ), 'VirtualFields' => Array( 'UserName' => Array('type'=>'string', 'default' => ''), Index: in-commerce/units/coupon_items/coupon_items_config.php =================================================================== --- in-commerce/units/coupon_items/coupon_items_config.php (revision 12650) +++ in-commerce/units/coupon_items/coupon_items_config.php (working copy) @@ -91,8 +91,8 @@ 'ItemName' => Array(), 'SKU' => Array(), 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f'), ~~- 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#' ),~~ ~~- 'BackOrderDate' => Array('formatter' => 'kDateFormatter'),~~ + 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'BackOrderDate' => Array('formatter' => 'kDateFormatter', 'default' => NULL), ), 'Grids' => Array( Index: in-commerce/units/coupons/coupons_config.php =================================================================== --- in-commerce/units/coupons/coupons_config.php (revision 12650) +++ in-commerce/units/coupons/coupons_config.php (working copy) @@ -144,7 +144,7 @@ WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId', 'left_title_field' => 'Login', 'required' => 0, 'default' => null, ), ~~- 'LastUsedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),~~ + 'LastUsedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'NumberOfUses' => Array ('type' => 'int', 'default' => 1), ), Index: in-commerce/units/currencies/currencies_config.php =================================================================== --- in-commerce/units/currencies/currencies_config.php (revision 12650) +++ in-commerce/units/currencies/currencies_config.php (working copy) @@ -110,7 +110,7 @@ 'SymbolPosition' => Array ('type' => 'int', 'default' => null,'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Left', 1 => 'la_Right'),'use_phrases' => '1'), 'Name' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), 'RateToPrimary' => Array ('type' => 'float', 'not_null' => 1, 'min_value_exc' => 0, 'formatter' => 'kFormatter', 'format' => '%0.4f', 'default' => 1), ~~- 'Modified' => Array ('type' => 'int', 'not_null' => 1, 'default' => '#NOW#', 'formatter' => 'kDateFormatter'),~~ + 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'Status' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1, 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'formatter' => 'kOptionsFormatter'), 'IsPrimary' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), Index: in-commerce/units/discount_items/discount_items_config.php =================================================================== --- in-commerce/units/discount_items/discount_items_config.php (revision 12650) +++ in-commerce/units/discount_items/discount_items_config.php (working copy) @@ -91,8 +91,8 @@ 'ItemName' => Array(), 'SKU' => Array(), 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f'), ~~- 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#' ),~~ ~~- 'BackOrderDate' => Array('formatter' => 'kDateFormatter'),~~ + 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'BackOrderDate' => Array('formatter' => 'kDateFormatter', 'default' => NULL), ), 'Grids' => Array( Index: in-commerce/units/downloads/downloads_config.php =================================================================== --- in-commerce/units/downloads/downloads_config.php (revision 12650) +++ in-commerce/units/downloads/downloads_config.php (working copy) @@ -84,8 +84,8 @@ 'FileId' => Array('type' => 'int','not_null' => 1, 'default' => 0), 'Filename' => Array('type' => 'string','not_null' => 1, 'default' => ''), 'IPAddress' => Array('type' => 'string','not_null' => 1, 'default' => ''), ~~- 'StartedOn' => Array('type' => 'int','formatter' => 'kDateFormatter','not_null' => 1, 'default' => 0),~~ ~~- 'EndedOn' => Array('type' => 'int','formatter' => 'kDateFormatter','not_null' => 1, 'default' => 0),~~ + 'StartedOn' => Array('type' => 'int','formatter' => 'kDateFormatter', 'default' => NULL), + 'EndedOn' => Array('type' => 'int','formatter' => 'kDateFormatter', 'default' => NULL), ), 'VirtualFields' => Array( ), Index: in-commerce/units/files/files_config.php =================================================================== --- in-commerce/units/files/files_config.php (revision 12650) +++ in-commerce/units/files/files_config.php (working copy) @@ -90,7 +90,7 @@ 'Status' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'IsPrimary' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'AddedOn' => Array('type' => 'int','formatter' => 'kDateFormatter','not_null' => '1','default' => '#NOW#'),~~ + 'AddedOn' => Array('type' => 'int','formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'AddedById' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'MIMEType' => Array('type' => 'string','not_null' => '1','default' => ''), ), Index: in-commerce/units/gateways/gateways_config.php =================================================================== --- in-commerce/units/gateways/gateways_config.php (revision 12650) +++ in-commerce/units/gateways/gateways_config.php (working copy) @@ -60,7 +60,7 @@ 'SystemFieldName' => Array('type' => 'string', 'not_null' => 1, 'default' => 0, ), 'FieldName' => Array('type' => 'string', 'required' => true, 'max_len' => 100, 'not_null' => 1, 'default' => 0, ), 'ElementType' => Array('type' => 'string', 'not_null' => 1, 'default' => 0, ), ~~- 'ValueList' => Array('type' => 'string', 'not_null' => 1, 'default' => 0, ),~~ + 'ValueList' => Array('type' => 'string', 'default' => NULL), 'GatewayId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), ), Index: in-commerce/units/manufacturers/manufacturers_config.php =================================================================== --- in-commerce/units/manufacturers/manufacturers_config.php (revision 12650) +++ in-commerce/units/manufacturers/manufacturers_config.php (working copy) @@ -88,7 +88,7 @@ 'Fields' => Array ( 'ManufacturerId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'Name' => Array('type' => 'string','not_null' => '1','default' => '', 'required'=>true,'max_len'=>255), ~~- 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'URL' => Array('type' => 'string','not_null' => '1','default' => '','max_len'=>255), 'Logo' => Array ( 'type' => 'string', Index: in-commerce/units/orders/orders_config.php =================================================================== --- in-commerce/units/orders/orders_config.php (revision 12650) +++ in-commerce/units/orders/orders_config.php (working copy) @@ -310,11 +310,11 @@ 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0 ), ~~- 'OrderDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'required' => 1, 'not_null' => '1', 'default' => '#NOW#'),~~ + 'OrderDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'PortalUserId'=>Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options'=>Array(-1=>'root',-2=>'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId','left_title_field'=>'Login','required'=>1,'not_null'=>1,'default'=>-1), 'OrderIP' => Array('type' => 'string','not_null' => '1','default' => '', 'filter_type' => 'like'), ~~- 'UserComment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ ~~- 'AdminComment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'UserComment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'AdminComment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'BillingTo' => Array('type' => 'string','not_null' => '1','default' => ''), 'BillingCompany' => Array('type' => 'string','not_null' => '1','default' => ''), 'BillingPhone' => Array('type' => 'string','not_null' => '1','default' => ''), @@ -347,7 +347,7 @@ 'PaymentNameOnCard' => Array('type' => 'string','not_null' => '1','default' => ''), 'PaymentCCExpDate' => Array('type' => 'string', 'formatter'=>'kCCDateFormatter', 'month_field' => 'PaymentCCExpMonth', 'year_field'=>'PaymentCCExpYear', 'not_null' => '1','default' => ''), 'PaymentCardType' => Array('type' => 'string', 'not_null' => 1, 'formatter'=>'kOptionsFormatter', 'options' => Array('' => '','1' => 'Visa','2' => 'Mastercard', '3' => 'Amex', '4' => 'Discover', '5' => 'Diners Club', '6' => 'JBC'), 'default' => ''), ~~- 'PaymentExpires' => Array('type' => 'int', 'formatter'=>'kDateFormatter','not_null' => '1','default' => '#NOW#'),~~ + 'PaymentExpires' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'ShippingTo' => Array('type' => 'string','not_null' => '1','default' => ''), 'ShippingCompany' => Array('type' => 'string','not_null' => '1','default' => ''), 'ShippingPhone' => Array('type' => 'string','not_null' => '1','default' => ''), @@ -377,7 +377,7 @@ 'ShippingCost' => Array('type' => 'double','formatter'=>'kFormatter','format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), 'ShippingCustomerAccount' => Array('type' => 'string','not_null' => '1','default' => ''), 'ShippingTracking' => Array('type' => 'string','not_null' => '1','default' => ''), ~~- 'ShippingDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter','default' => null),~~ + 'ShippingDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), 'SubTotal' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), 'ReturnTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), 'CostTotal' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), @@ -391,8 +391,8 @@ 'CouponDiscount' => Array('type' => 'float','not_null' => '1','default' => '0.00','formatter'=>'kFormatter','format'=>'%01.2f'), 'DiscountTotal' => Array('type' => 'float','not_null' => '1','default' => '0.00','formatter'=>'kFormatter','format'=>'%01.2f'), 'TransactionStatus' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(0=>'la_Invalid', 1 => 'la_Verified', 2 => 'la_Penging'), 'use_phrases'=>1, 'not_null' => '1','default' => 2), ~~- 'GWResult1' => Array('type' => 'string', 'formatter'=>'kSerializedFormatter', 'not_null' => '1','default' => ''),~~ ~~- 'GWResult2' => Array('type' => 'string', 'formatter'=>'kSerializedFormatter', 'not_null' => '1','default' => ''),~~ + 'GWResult1' => Array('type' => 'string', 'formatter'=>'kSerializedFormatter', 'default' => NULL), + 'GWResult2' => Array('type' => 'string', 'formatter'=>'kSerializedFormatter', 'default' => NULL), 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0), 'VisitId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'AffiliateCommission' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'), Index: in-commerce/units/payment_type/payment_type_config.php =================================================================== --- in-commerce/units/payment_type/payment_type_config.php (revision 12650) +++ in-commerce/units/payment_type/payment_type_config.php (working copy) @@ -119,7 +119,7 @@ 'GatewayId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Gateways', 'option_key_field' => 'GatewayId', 'option_title_field' => 'Name', 'default' => 1, 'not_null' => 1), 'PlacedOrdersEdit' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'ProcessingFee' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'default' => '0.00'), ~~- 'PortalGroups' => Array ('type' => 'string', 'not_null' => 1, 'default' => '',),~~ + 'PortalGroups' => Array ('type' => 'string', 'default' => NULL), ), /* 'VirtualFields' => Array ( 'Qty' => 1, Index: in-commerce/units/product_option_combinations/product_option_combinations_config.php =================================================================== --- in-commerce/units/product_option_combinations/product_option_combinations_config.php (revision 12650) +++ in-commerce/units/product_option_combinations/product_option_combinations_config.php (working copy) @@ -60,7 +60,7 @@ 'Fields' => Array ( 'CombinationId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), 'ProductId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), ~~- 'Combination' => Array('type' => 'string', 'required' => 1, 'formatter' => 'kCombinationFormatter', 'format'=>"%s: %s<br>", 'not_null' => 1, 'default' => '', ),~~ + 'Combination' => Array('type' => 'string', 'required' => 1, 'formatter' => 'kCombinationFormatter', 'format'=>"%s: %s<br>", 'default' => NULL), 'CombinationCRC' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), 'PriceType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Txt_=', 2 => 'la_Flat', 3 => 'la_Percent'), 'use_phrases' => 1, 'default' => 3, ), 'Price' => Array('type' => 'float', 'required' => 1, 'formatter' => 'kFormatter', 'default' => '', ), Index: in-commerce/units/products/products_config.php =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: in-commerce/units/shipping/shipping_config.php =================================================================== --- in-commerce/units/shipping/shipping_config.php (revision 12650) +++ in-commerce/units/shipping/shipping_config.php (working copy) @@ -139,7 +139,7 @@ 'ZeroIfEmpty' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Zeros', 0 => 'la_NoShipments' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => true ), 'PrecisionBeforeSep' => Array ('type' => 'int', 'options' => Array ( 1 => '1 digit', 2 => '2 digits', 3 => '3 digits', 4 => '4 digits' ), 'default' => 2, 'not_null' => true ), 'PrecisionAfterSep' => Array ('type' => 'int', 'options' => Array ( 0 => 'none', 1 => '1 digit', 2 => '2 digits' ), 'default' => 2, 'not_null' => true ), ~~- 'PortalGroups' => Array ('type' => 'string', 'not_null' => 1, 'default' => 0,),~~ + 'PortalGroups' => Array ('type' => 'string', 'default' => NULL), 'FreeShippingMinAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' => 1, 'format' => '%.2f', 'default' => 0), 'IsFreePromoShipping' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'use_phrases' => 1, 'options' => Array (0 => 'la_No', 1 => 'la_Yes', ), 'formatter' => 'kOptionsFormatter'), 'InsuranceFee' => Array ('type' => 'float', 'default' => null), Index: in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php =================================================================== --- in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (revision 12650) +++ in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (working copy) @@ -91,7 +91,7 @@ 'FlatSurcharge' => Array ('type' => 'double', 'not_null' => '1', 'default' => '0'), 'PercentSurcharge' => Array ('type' => 'double', 'not_null' => '1', 'default' => '0'), 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Enabled', 0 => 'la_Disabled' ), 'default' => 0, 'not_null' => 1), ~~- 'Properties' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),~~ + 'Properties' => Array ('type' => 'string', 'default' => NULL), 'ClassName' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), ), Index: in-link/install/install_schema.sql =================================================================== --- in-link/install/install_schema.sql (revision 12650) +++ in-link/install/install_schema.sql (working copy) @@ -61,12 +61,12 @@ ); CREATE TABLE LinkValidation ( ~~- LinkValidationId int(11) NOT NULL auto_increment,~~ ~~- LinkId int(11) NOT NULL default '0',~~ ~~- ValidationTime double NOT NULL default '0',~~ ~~- ValidationCode varchar(50) default NULL,~~ ~~- ValidationStatus tinyint(4) NOT NULL default '0',~~ ~~- PRIMARY KEY (LinkValidationId),~~ + LinkValidationId int(11) NOT NULL AUTO_INCREMENT, + LinkId int(11) NOT NULL DEFAULT '0', + ValidationTime int(11) DEFAULT NULL, + ValidationCode varchar(50) DEFAULT NULL, + ValidationStatus tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (LinkValidationId), UNIQUE KEY LinkId (LinkId), KEY ValidationStatus (ValidationStatus), KEY ValidationTime (ValidationTime) @@ -91,38 +91,38 @@ ); CREATE TABLE ListingTypes ( ~~- ListingTypeId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- Description text NOT NULL,~~ ~~- Duration int(11) NOT NULL default '0',~~ ~~- DurationType int(11) NOT NULL default '0',~~ ~~- OnPurchaseEdPick tinyint(4) NOT NULL default '3',~~ ~~- OnPurchaseNew tinyint(4) NOT NULL default '3',~~ ~~- OnPurchasePop tinyint(4) NOT NULL default '3',~~ ~~- OnPurchaseHot tinyint(4) NOT NULL default '3',~~ ~~- OnPurchasePriorityAction tinyint(4) NOT NULL default '0',~~ ~~- OnPurchasePriorityValue tinyint(4) NOT NULL default '1',~~ ~~- OnPurchaseAddToCatEnabled tinyint(4) NOT NULL default '0',~~ ~~- OnPurchaseAddToCat int(11) NOT NULL default '0',~~ ~~- OnPurchaseCustomTemplate varchar(255) NOT NULL default '',~~ ~~- OnPurchaseStatus tinyint(4) NOT NULL default '3',~~ ~~- OnExpireEdPick tinyint(4) NOT NULL default '3',~~ ~~- OnExpireNew tinyint(4) NOT NULL default '3',~~ ~~- OnExpirePop tinyint(4) NOT NULL default '3',~~ ~~- OnExpireHot tinyint(4) NOT NULL default '3',~~ ~~- OnExpirePriorityAction tinyint(4) NOT NULL default '0',~~ ~~- OnExpirePriorityValue tinyint(4) NOT NULL default '1',~~ ~~- OnExpireRemoveFromCatEnabled tinyint(4) NOT NULL default '0',~~ ~~- OnExpireRemoveFromCat int(11) NOT NULL default '0',~~ ~~- OnExpireCustomTemplate varchar(255) NOT NULL default '',~~ ~~- OnExpireStatus tinyint(4) NOT NULL default '3',~~ ~~- RenewalReminder int(11) NOT NULL default '0',~~ ~~- EnableBuying tinyint(4) NOT NULL default '0',~~ ~~- ShopCartName varchar(255) default NULL,~~ ~~- Price double default NULL,~~ ~~- Recurring tinyint(4) NOT NULL default '0',~~ ~~- VirtualProductId int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (ListingTypeId),~~ + ListingTypeId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + Description text, + Duration int(11) NOT NULL DEFAULT '0', + DurationType int(11) NOT NULL DEFAULT '0', + OnPurchaseEdPick tinyint(4) NOT NULL DEFAULT '3', + OnPurchaseNew tinyint(4) NOT NULL DEFAULT '3', + OnPurchasePop tinyint(4) NOT NULL DEFAULT '3', + OnPurchaseHot tinyint(4) NOT NULL DEFAULT '3', + OnPurchasePriorityAction tinyint(4) NOT NULL DEFAULT '0', + OnPurchasePriorityValue tinyint(4) NOT NULL DEFAULT '1', + OnPurchaseAddToCatEnabled tinyint(4) NOT NULL DEFAULT '0', + OnPurchaseAddToCat int(11) NOT NULL DEFAULT '0', + OnPurchaseCustomTemplate varchar(255) NOT NULL DEFAULT '', + OnPurchaseStatus tinyint(4) NOT NULL DEFAULT '3', + OnExpireEdPick tinyint(4) NOT NULL DEFAULT '3', + OnExpireNew tinyint(4) NOT NULL DEFAULT '3', + OnExpirePop tinyint(4) NOT NULL DEFAULT '3', + OnExpireHot tinyint(4) NOT NULL DEFAULT '3', + OnExpirePriorityAction tinyint(4) NOT NULL DEFAULT '0', + OnExpirePriorityValue tinyint(4) NOT NULL DEFAULT '1', + OnExpireRemoveFromCatEnabled tinyint(4) NOT NULL DEFAULT '0', + OnExpireRemoveFromCat int(11) NOT NULL DEFAULT '0', + OnExpireCustomTemplate varchar(255) NOT NULL DEFAULT '', + OnExpireStatus tinyint(4) NOT NULL DEFAULT '3', + RenewalReminder int(11) NOT NULL DEFAULT '0', + EnableBuying tinyint(4) NOT NULL DEFAULT '0', + ShopCartName varchar(255) DEFAULT NULL, + Price double DEFAULT NULL, + Recurring tinyint(4) NOT NULL DEFAULT '0', + VirtualProductId int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (ListingTypeId), KEY VirtualProductId (VirtualProductId) ); @@ -134,11 +134,11 @@ ); CREATE TABLE LinkVisits ( ~~- VisitId int(11) NOT NULL auto_increment,~~ ~~- ResourceId int(11) default NULL,~~ ~~- PortalUserId int(11) NOT NULL default '0',~~ ~~- VisitTimestamp int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (VisitId),~~ + VisitId int(11) NOT NULL AUTO_INCREMENT, + ResourceId int(11) DEFAULT NULL, + PortalUserId int(11) NOT NULL DEFAULT '0', + VisitTimestamp int(11) DEFAULT NULL, + PRIMARY KEY (VisitId), KEY ResourceId (ResourceId), KEY PortalUserId (PortalUserId), KEY VisitTimestamp (VisitTimestamp) Index: in-link/install/upgrades.sql =================================================================== --- in-link/install/upgrades.sql (revision 12650) +++ in-link/install/upgrades.sql (working copy) @@ -50,4 +50,9 @@ INSERT INTO Events VALUES(DEFAULT, 'LINK.REVIEW.ADD.PENDING', NULL, 1, 0, NULL, 'In-Link', 'la_event_link.review.add.pending', 1); ~~-UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('link_ReviewDelay_Value', 'link_RatingDelay_Value');~~ \ No newline at end of file +UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('link_ReviewDelay_Value', 'link_RatingDelay_Value'); + +# ===== v 5.0.2 ===== +ALTER TABLE ListingTypes CHANGE Description Description text NULL; +ALTER TABLE LinkValidation CHANGE ValidationTime ValidationTime INT NULL DEFAULT NULL; +ALTER TABLE LinkVisits CHANGE VisitTimestamp VisitTimestamp INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-link/units/l-visits/l-visits_config.php =================================================================== --- in-link/units/l-visits/l-visits_config.php (revision 12650) +++ in-link/units/l-visits/l-visits_config.php (working copy) @@ -80,6 +80,6 @@ 'VisitId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'ResourceId' => Array ('type' => 'int', 'default' => NULL), 'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'VisitTimestamp' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => '#NOW#'),~~ + 'VisitTimestamp' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), ), ); \ No newline at end of file Index: in-link/units/link_validation/link_validation_config.php =================================================================== --- in-link/units/link_validation/link_validation_config.php (revision 12650) +++ in-link/units/link_validation/link_validation_config.php (working copy) @@ -114,7 +114,7 @@ 'Fields' => Array ( 'LinkValidationId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'LinkId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'ValidationTime' => Array ('type' => 'float', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'ValidationTime' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'ValidationCode' => Array ( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (200 => '200 OK', 301 => '301 Moved Permanently', 302 => '302 Found', 400 => '400 Bad Request', 403 => '403 Forbidden', 404 => '404 Not Found', 500 => '500 Internal Server Error'), Index: in-link/units/listing_types/listing_types_config.php =================================================================== --- in-link/units/listing_types/listing_types_config.php (revision 12650) +++ in-link/units/listing_types/listing_types_config.php (working copy) @@ -98,7 +98,7 @@ ( 'ListingTypeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required' => '1'), ~~- 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'Duration' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'DurationType' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, 'formatter'=>'kOptionsFormatter','use_phrases' => 1,'options' => Array(1 => 'la_opt_sec', 2 => 'la_opt_min', 3 => 'la_opt_hour', 4 => 'la_opt_day', 5 => 'la_opt_week', 6 => 'la_opt_month', 7 => 'la_opt_year')), 'OnPurchaseEdPick' => Array('type' => 'int','not_null' => '1','formatter'=>'kOptionsFormatter','use_phrases' => 1,'options' => Array(3 => 'la_Unchanged', 1 => 'la_On', 0 => 'la_Off'), 'default' => 3), Index: in-news/install/install_schema.sql =================================================================== --- in-news/install/install_schema.sql (revision 12650) +++ in-news/install/install_schema.sql (working copy) @@ -1,19 +1,19 @@ CREATE TABLE News ( ~~- NewsId int(11) NOT NULL auto_increment,~~ ~~- Title varchar(255) NOT NULL default '',~~ ~~- l1_Title varchar(255) NOT NULL default '',~~ ~~- l2_Title varchar(255) NOT NULL default '',~~ ~~- l3_Title varchar(255) NOT NULL default '',~~ ~~- l4_Title varchar(255) NOT NULL default '',~~ ~~- l5_Title varchar(255) NOT NULL default '',~~ ~~- AutomaticFilename tinyint(3) unsigned NOT NULL default '1',~~ + NewsId int(11) NOT NULL AUTO_INCREMENT, + Title varchar(255) NOT NULL DEFAULT '', + l1_Title varchar(255) NOT NULL DEFAULT '', + l2_Title varchar(255) NOT NULL DEFAULT '', + l3_Title varchar(255) NOT NULL DEFAULT '', + l4_Title varchar(255) NOT NULL DEFAULT '', + l5_Title varchar(255) NOT NULL DEFAULT '', + AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1', Excerpt text, l1_Excerpt text, l2_Excerpt text, l3_Excerpt text, l4_Excerpt text, l5_Excerpt text, ~~- Author varchar(255) NOT NULL default '',~~ + Author varchar(255) NOT NULL DEFAULT '', Body text, l1_Body text, l2_Body text, @@ -21,30 +21,30 @@ l4_Body text, l5_Body text, MetaKeywords varchar(255) DEFAULT NULL, ~~- MetaDescription text NULL DEFAULT NULL,~~ ~~- CreatedOn int(11) NOT NULL default '0',~~ ~~- TextFormat int(11) NOT NULL default '0',~~ ~~- EndOn INT(11) NULL DEFAULT NULL,~~ ~~- Hits double(20,6) NOT NULL default '0.000000',~~ ~~- CachedRating varchar(10) default '0',~~ ~~- CachedVotesQty int(11) NOT NULL default '0',~~ ~~- CreatedById int(11) NOT NULL default '-1',~~ ~~- Priority INT(11) NOT NULL DEFAULT '0',~~ ~~- `Status` tinyint(4) NOT NULL default '2',~~ ~~- EditorsPick tinyint(4) NOT NULL default '0',~~ ~~- LeadStory tinyint(4) NOT NULL default '0',~~ ~~- LeadCatStory tinyint(4) NOT NULL default '0',~~ ~~- ResourceId int(11) default NULL,~~ ~~- CachedReviewsQty int(11) NOT NULL default '0',~~ ~~- StartDate int(11) NOT NULL default '0',~~ ~~- NewItem tinyint(4) NOT NULL default '2',~~ ~~- PopItem tinyint(4) NOT NULL default '2',~~ ~~- HotItem tinyint(4) NOT NULL default '2',~~ ~~- Archived int(11) NOT NULL default '0',~~ ~~- Modified int(11) NOT NULL default '0',~~ ~~- ModifiedById int(11) NOT NULL default '-1',~~ ~~- OrgId int(11) default NULL,~~ ~~- PRIMARY KEY (NewsId),~~ + MetaDescription text, + CreatedOn int(11) DEFAULT NULL, + TextFormat int(11) NOT NULL DEFAULT '0', + EndOn int(11) DEFAULT NULL, + Hits double(20,6) NOT NULL DEFAULT '0.000000', + CachedRating varchar(10) DEFAULT '0', + CachedVotesQty int(11) NOT NULL DEFAULT '0', + CreatedById int(11) NOT NULL DEFAULT '-1', + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '2', + EditorsPick tinyint(4) NOT NULL DEFAULT '0', + LeadStory tinyint(4) NOT NULL DEFAULT '0', + LeadCatStory tinyint(4) NOT NULL DEFAULT '0', + ResourceId int(11) DEFAULT NULL, + CachedReviewsQty int(11) NOT NULL DEFAULT '0', + StartDate int(11) DEFAULT NULL, + NewItem tinyint(4) NOT NULL DEFAULT '2', + PopItem tinyint(4) NOT NULL DEFAULT '2', + HotItem tinyint(4) NOT NULL DEFAULT '2', + Archived int(11) NOT NULL DEFAULT '0', + Modified int(11) DEFAULT NULL, + ModifiedById int(11) NOT NULL DEFAULT '-1', + OrgId int(11) DEFAULT NULL, + PRIMARY KEY (NewsId), UNIQUE KEY ResourceId (ResourceId), KEY Title (Title), KEY l1_Title (l1_Title), @@ -67,7 +67,7 @@ KEY CreatedOn (CreatedOn), KEY EndOn (EndOn), KEY Priority (Priority), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY EditorsPick (EditorsPick), KEY Hits (Hits), KEY Modified (Modified), Index: in-news/install/upgrades.sql =================================================================== --- in-news/install/upgrades.sql (revision 12650) +++ in-news/install/upgrades.sql (working copy) @@ -49,4 +49,10 @@ INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.add.pending', 1); ~~-UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('News_ReviewDelay_Value', 'News_RatingDelay_Value');~~ \ No newline at end of file +UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('News_ReviewDelay_Value', 'News_RatingDelay_Value'); + +# ===== v 5.0.2 ===== +ALTER TABLE News + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL, + CHANGE StartDate StartDate INT(11) NULL DEFAULT NULL, + CHANGE Modified Modified INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-news/units/articles/articles_config.php =================================================================== --- in-news/units/articles/articles_config.php (revision 12650) +++ in-news/units/articles/articles_config.php (working copy) @@ -341,7 +341,7 @@ 'Excerpt' => Array('type' => 'string', /*'formatter' => 'kMultiLanguage',*/ 'default' => null), 'Author' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'Body' => Array('type' => 'string', 'formatter' => 'kFormatter',/*'kMultiLanguage'*/ 'using_fck' => 1, 'required' => 1, 'default' => null), ~~- 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1,'default' => '#NOW#'),~~ + 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'TextFormat' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'EndOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), 'Hits' => Array('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0), @@ -355,12 +355,12 @@ 'LeadCatStory' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'ResourceId' => Array('type' => 'int', 'default' => null), 'CachedReviewsQty' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'StartDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1, 'default' => '#NOW#'),~~ + 'StartDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'NewItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1,'default' => 2), 'PopItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1,'default' => 2), 'HotItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1,'default' => 2), 'Archived' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 2 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), ~~- 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),~~ + 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'ModifiedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => -1), 'OrgId' => Array('type' => 'int', 'default' => null), 'MetaKeywords' => Array('type' => 'string', 'default' => null),

Index: core/install/install_schema.sql =================================================================== --- core/install/install_schema.sql (revision 12677) +++ core/install/install_schema.sql (working copy) @@ -80,16 +80,16 @@ ); CREATE TABLE EmailQueue ( ~~- EmailQueueId int(10) unsigned NOT NULL auto_increment,~~ ~~- ToEmail varchar(255) NOT NULL default '',~~ ~~- `Subject` varchar(255) NOT NULL default '',~~ + EmailQueueId int(10) unsigned NOT NULL AUTO_INCREMENT, + ToEmail varchar(255) NOT NULL DEFAULT '', + `Subject` varchar(255) NOT NULL DEFAULT '', MessageHeaders text, MessageBody longtext, ~~- Queued int(10) unsigned NOT NULL default '0',~~ ~~- SendRetries int(10) unsigned NOT NULL default '0',~~ ~~- LastSendRetry int(10) unsigned NOT NULL default '0',~~ ~~- MailingId int(10) unsigned NOT NULL,~~ ~~- PRIMARY KEY (EmailQueueId),~~ + Queued int(10) unsigned DEFAULT NULL, + SendRetries int(10) unsigned NOT NULL DEFAULT '0', + LastSendRetry int(10) unsigned DEFAULT NULL, + MailingId int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (EmailQueueId), KEY LastSendRetry (LastSendRetry), KEY SendRetries (SendRetries), KEY MailingId (MailingId) @@ -124,27 +124,27 @@ ); CREATE TABLE Language ( ~~- 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',~~ ~~- PrimaryLang int(11) NOT NULL default '0',~~ ~~- AdminInterfaceLang tinyint(3) unsigned NOT NULL default '0',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- IconURL varchar(255) default NULL,~~ ~~- IconDisabledURL 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 varchar(10) NOT NULL default '',~~ ~~- ThousandSep varchar(10) NOT NULL default '',~~ ~~- `Charset` varchar(20) NOT NULL default '',~~ ~~- UnitSystem tinyint(4) NOT NULL default '1',~~ + 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', + PrimaryLang int(11) NOT NULL DEFAULT '0', + AdminInterfaceLang tinyint(3) unsigned NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + IconURL varchar(255) DEFAULT NULL, + IconDisabledURL 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 varchar(10) NOT NULL DEFAULT '', + ThousandSep varchar(10) NOT NULL DEFAULT '', + `Charset` varchar(20) NOT NULL DEFAULT '', + UnitSystem tinyint(4) NOT NULL DEFAULT '1', FilenameReplacements text, ~~- Locale varchar(10) NOT NULL default 'en-US',~~ ~~- UserDocsUrl varchar(255) NOT NULL,~~ ~~- PRIMARY KEY (LanguageId),~~ + Locale varchar(10) NOT NULL DEFAULT 'en-US', + UserDocsUrl varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (LanguageId), KEY Enabled (Enabled), KEY PrimaryLang (PrimaryLang), KEY AdminInterfaceLang (AdminInterfaceLang), @@ -167,10 +167,10 @@ ); CREATE TABLE PersistantSessionData ( ~~- VariableId bigint(20) NOT NULL auto_increment,~~ ~~- PortalUserId int(11) NOT NULL default '0',~~ ~~- VariableName varchar(255) NOT NULL default '',~~ ~~- VariableValue text NOT NULL,~~ + VariableId bigint(20) NOT NULL AUTO_INCREMENT, + PortalUserId int(11) NOT NULL DEFAULT '0', + VariableName varchar(255) NOT NULL DEFAULT '', + VariableValue text, PRIMARY KEY (VariableId), KEY UserId (PortalUserId), KEY VariableName (VariableName) @@ -178,12 +178,12 @@ CREATE TABLE Phrase ( Phrase varchar(255) NOT NULL DEFAULT '', ~~- PhraseKey varchar(255) NOT NULL,~~ ~~- Translation text NOT NULL,~~ + PhraseKey varchar(255) NOT NULL DEFAULT '', + Translation text, PhraseType int(11) NOT NULL DEFAULT '0', PhraseId int(11) NOT NULL AUTO_INCREMENT, LanguageId int(11) NOT NULL DEFAULT '0', ~~- LastChanged int(10) unsigned NOT NULL DEFAULT '0',~~ + LastChanged int(10) unsigned DEFAULT NULL, LastChangeIP varchar(15) NOT NULL DEFAULT '', Module varchar(30) NOT NULL DEFAULT 'In-Portal', PRIMARY KEY (PhraseId), @@ -194,13 +194,13 @@ ); CREATE TABLE PhraseCache ( ~~- Template varchar(40) NOT NULL default '',~~ ~~- PhraseList text NOT NULL,~~ ~~- CacheDate int(11) NOT NULL default '0',~~ ~~- ThemeId int(11) NOT NULL default '0',~~ ~~- StylesheetId int(10) unsigned NOT NULL default '0',~~ + Template varchar(40) NOT NULL DEFAULT '', + PhraseList text, + CacheDate int(11) NOT NULL DEFAULT '0', + ThemeId int(11) NOT NULL DEFAULT '0', + StylesheetId int(10) unsigned NOT NULL DEFAULT '0', ConfigVariables text, ~~- PRIMARY KEY (Template),~~ + PRIMARY KEY (Template), KEY CacheDate (CacheDate), KEY ThemeId (ThemeId), KEY StylesheetId (StylesheetId) @@ -223,38 +223,38 @@ ); CREATE TABLE PortalUser ( ~~- PortalUserId int(11) NOT NULL auto_increment,~~ ~~- Login varchar(255) default NULL,~~ ~~- `Password` VARCHAR(255) NULL DEFAULT 'd41d8cd98f00b204e9800998ecf8427e',~~ ~~- FirstName VARCHAR(255) NOT NULL DEFAULT '',~~ ~~- LastName VARCHAR(255) NOT NULL DEFAULT '',~~ ~~- Company varchar(255) NOT NULL default '',~~ ~~- Email varchar(255) NOT NULL default '',~~ ~~- CreatedOn INT DEFAULT NULL,~~ ~~- Phone varchar(20) default NULL,~~ ~~- Fax varchar(255) NOT NULL default '',~~ ~~- Street varchar(255) default NULL,~~ ~~- Street2 varchar(255) NOT NULL default '',~~ ~~- City varchar(20) default NULL,~~ ~~- State varchar(20) NOT NULL default '',~~ ~~- Zip varchar(20) default NULL,~~ ~~- Country varchar(20) NOT NULL default '',~~ ~~- 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,~~ ~~- tz int(11) default NULL,~~ ~~- ip varchar(20) default NULL,~~ ~~- IsBanned tinyint(1) NOT NULL default '0',~~ ~~- PassResetTime INT(11) UNSIGNED NULL DEFAULT NULL,~~ ~~- PwResetConfirm varchar(255) default NULL,~~ ~~- PwRequestTime INT(11) UNSIGNED NULL DEFAULT NULL,~~ ~~- MinPwResetDelay int(11) NOT NULL default '1800',~~ ~~- PRIMARY KEY (PortalUserId),~~ + PortalUserId int(11) NOT NULL AUTO_INCREMENT, + Login varchar(255) DEFAULT NULL, + `Password` varchar(255) DEFAULT 'd41d8cd98f00b204e9800998ecf8427e', + FirstName varchar(255) NOT NULL DEFAULT '', + LastName varchar(255) NOT NULL DEFAULT '', + Company varchar(255) NOT NULL DEFAULT '', + Email varchar(255) NOT NULL DEFAULT '', + CreatedOn int(11) DEFAULT NULL, + Phone varchar(20) DEFAULT NULL, + Fax varchar(255) NOT NULL DEFAULT '', + Street varchar(255) DEFAULT NULL, + Street2 varchar(255) NOT NULL DEFAULT '', + City varchar(20) DEFAULT NULL, + State varchar(20) NOT NULL DEFAULT '', + Zip varchar(20) DEFAULT NULL, + Country varchar(20) NOT NULL DEFAULT '', + ResourceId int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + Modified int(11) DEFAULT NULL, + dob int(11) DEFAULT NULL, + tz int(11) DEFAULT NULL, + ip varchar(20) DEFAULT NULL, + IsBanned tinyint(1) NOT NULL DEFAULT '0', + PassResetTime int(11) unsigned DEFAULT NULL, + PwResetConfirm varchar(255) DEFAULT NULL, + PwRequestTime int(11) unsigned DEFAULT NULL, + MinPwResetDelay int(11) NOT NULL DEFAULT '1800', + PRIMARY KEY (PortalUserId), UNIQUE KEY ResourceId (ResourceId), UNIQUE KEY Login (Login), KEY CreatedOn (CreatedOn), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY Modified (Modified), KEY dob (dob), KEY IsBanned (IsBanned) @@ -268,10 +268,10 @@ ); CREATE TABLE SessionData ( ~~- SessionKey varchar(50) NOT NULL default '',~~ ~~- VariableName varchar(255) NOT NULL default '',~~ ~~- VariableValue longtext NOT NULL,~~ ~~- PRIMARY KEY (SessionKey,VariableName),~~ + SessionKey varchar(50) NOT NULL DEFAULT '', + VariableName varchar(255) NOT NULL DEFAULT '', + VariableValue longtext, + PRIMARY KEY (SessionKey,VariableName), KEY SessionKey (SessionKey), KEY VariableName (VariableName) ); @@ -338,14 +338,14 @@ ); CREATE TABLE EmailLog ( ~~- EmailLogId int(11) NOT NULL auto_increment,~~ ~~- fromuser varchar(200) default NULL,~~ ~~- addressto varchar(255) default NULL,~~ ~~- `subject` varchar(255) default NULL,~~ ~~- `timestamp` bigint(20) default '0',~~ ~~- event varchar(100) default NULL,~~ ~~- EventParams text NOT NULL,~~ ~~- PRIMARY KEY (EmailLogId),~~ + EmailLogId int(11) NOT NULL AUTO_INCREMENT, + fromuser varchar(200) DEFAULT NULL, + addressto varchar(255) DEFAULT NULL, + `subject` varchar(255) DEFAULT NULL, + `timestamp` bigint(20) DEFAULT '0', + `event` varchar(100) DEFAULT NULL, + EventParams text, + PRIMARY KEY (EmailLogId), KEY `timestamp` (`timestamp`) ); @@ -389,9 +389,9 @@ l3_Description text, l4_Description text, l5_Description text, ~~- CreatedOn int(11) NOT NULL DEFAULT '0',~~ + CreatedOn int(11) DEFAULT NULL, EditorsPick tinyint(4) NOT NULL DEFAULT '0', ~~- `Status` tinyint(4) NOT NULL DEFAULT '2',~~ + `Status` tinyint(4) NOT NULL DEFAULT '1', Priority int(11) NOT NULL DEFAULT '0', MetaKeywords text, CachedDescendantCatsQty int(11) DEFAULT NULL, @@ -411,7 +411,7 @@ 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',~~ + Modified int(11) DEFAULT NULL, ModifiedById int(11) NOT NULL DEFAULT '0', CachedTemplate varchar(255) NOT NULL DEFAULT '', Template varchar(255) NOT NULL DEFAULT '#inherit#', @@ -496,13 +496,13 @@ ); CREATE TABLE Stylesheets ( ~~- StylesheetId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- Description varchar(255) NOT NULL default '',~~ ~~- AdvancedCSS text NOT NULL,~~ ~~- LastCompiled int(10) unsigned NOT NULL default '0',~~ ~~- Enabled int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (StylesheetId),~~ + StylesheetId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + Description varchar(255) NOT NULL DEFAULT '', + AdvancedCSS text, + LastCompiled int(10) unsigned DEFAULT NULL, + Enabled int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (StylesheetId), KEY Enabled (Enabled), KEY LastCompiled (LastCompiled) ); @@ -533,32 +533,32 @@ ); CREATE TABLE Skins ( ~~- SkinId int(11) NOT NULL auto_increment,~~ ~~- `Name` varchar(255) default NULL,~~ + SkinId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) DEFAULT NULL, CSS text, ~~- Logo varchar(255) default NULL,~~ ~~- LogoBottom varchar(255) NOT NULL,~~ ~~- LogoLogin varchar(255) NOT NULL,~~ ~~- Options text,~~ ~~- LastCompiled int(11) NOT NULL default '0',~~ ~~- IsPrimary int(1) NOT NULL default '0',~~ ~~- PRIMARY KEY (SkinId),~~ + Logo varchar(255) DEFAULT NULL, + LogoBottom varchar(255) NOT NULL DEFAULT '', + LogoLogin varchar(255) NOT NULL DEFAULT '', + `Options` text, + LastCompiled int(11) NOT NULL DEFAULT '0', + IsPrimary int(1) NOT NULL DEFAULT '0', + PRIMARY KEY (SkinId), KEY IsPrimary (IsPrimary), KEY LastCompiled (LastCompiled) ); CREATE TABLE ChangeLogs ( ~~- ChangeLogId bigint(20) NOT NULL auto_increment,~~ ~~- PortalUserId int(11) NOT NULL default '0',~~ ~~- SessionLogId int(11) NOT NULL default '0',~~ ~~- `Action` tinyint(4) NOT NULL default '0',~~ ~~- OccuredOn int(11) NOT NULL default '0',~~ ~~- Prefix varchar(255) NOT NULL default '',~~ ~~- ItemId bigint(20) NOT NULL default '0',~~ ~~- Changes text NOT NULL,~~ ~~- MasterPrefix varchar(255) NOT NULL default '',~~ ~~- MasterId bigint(20) NOT NULL default '0',~~ ~~- PRIMARY KEY (ChangeLogId),~~ + ChangeLogId bigint(20) NOT NULL AUTO_INCREMENT, + PortalUserId int(11) NOT NULL DEFAULT '0', + SessionLogId int(11) NOT NULL DEFAULT '0', + `Action` tinyint(4) NOT NULL DEFAULT '0', + OccuredOn int(11) DEFAULT NULL, + Prefix varchar(255) NOT NULL DEFAULT '', + ItemId bigint(20) NOT NULL DEFAULT '0', + Changes text, + MasterPrefix varchar(255) NOT NULL DEFAULT '', + MasterId bigint(20) NOT NULL DEFAULT '0', + PRIMARY KEY (ChangeLogId), KEY PortalUserId (PortalUserId), KEY SessionLogId (SessionLogId), KEY `Action` (`Action`), @@ -568,15 +568,15 @@ ); CREATE TABLE SessionLogs ( ~~- SessionLogId bigint(20) NOT NULL auto_increment,~~ ~~- PortalUserId int(11) NOT NULL default '0',~~ ~~- SessionId int(10) NOT NULL default '0',~~ ~~- `Status` tinyint(4) NOT NULL default '1',~~ ~~- SessionStart int(11) NOT NULL default '0',~~ ~~- SessionEnd int(11) default NULL,~~ ~~- IP varchar(15) NOT NULL default '',~~ ~~- AffectedItems int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (SessionLogId),~~ + SessionLogId bigint(20) NOT NULL AUTO_INCREMENT, + PortalUserId int(11) NOT NULL DEFAULT '0', + SessionId int(10) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + SessionStart int(11) DEFAULT NULL, + SessionEnd int(11) DEFAULT NULL, + IP varchar(15) NOT NULL DEFAULT '', + AffectedItems int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (SessionLogId), KEY SessionId (SessionId), KEY `Status` (`Status`), KEY PortalUserId (PortalUserId) @@ -756,24 +756,24 @@ ); CREATE TABLE ItemReview ( ~~- ReviewId int(11) NOT NULL auto_increment,~~ ~~- CreatedOn INT UNSIGNED NULL DEFAULT NULL,~~ ~~- ReviewText longtext NOT NULL,~~ ~~- Rating tinyint(3) unsigned default NULL,~~ ~~- IPAddress varchar(255) NOT NULL default '',~~ ~~- ItemId int(11) NOT NULL default '0',~~ ~~- CreatedById int(11) NOT NULL default '-1',~~ ~~- ItemType tinyint(4) NOT NULL default '0',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- Status tinyint(4) NOT NULL default '2',~~ ~~- TextFormat int(11) NOT NULL default '0',~~ ~~- Module varchar(255) NOT NULL default '',~~ ~~- PRIMARY KEY (ReviewId),~~ + ReviewId int(11) NOT NULL AUTO_INCREMENT, + CreatedOn int(10) unsigned DEFAULT NULL, + ReviewText longtext, + Rating tinyint(3) unsigned DEFAULT NULL, + IPAddress varchar(255) NOT NULL DEFAULT '', + ItemId int(11) NOT NULL DEFAULT '0', + CreatedById int(11) NOT NULL DEFAULT '-1', + ItemType tinyint(4) NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '2', + TextFormat int(11) NOT NULL DEFAULT '0', + Module varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (ReviewId), KEY CreatedOn (CreatedOn), KEY ItemId (ItemId), KEY ItemType (ItemType), KEY Priority (Priority), ~~- KEY Status (Status)~~ + KEY `Status` (`Status`) ); CREATE TABLE ItemTypes ( @@ -795,19 +795,19 @@ ); CREATE TABLE ItemFiles ( ~~- FileId int(11) NOT NULL auto_increment,~~ ~~- ResourceId int(11) unsigned NOT NULL default '0',~~ ~~- FileName varchar(255) NOT NULL default '',~~ ~~- FilePath varchar(255) NOT NULL default '',~~ ~~- Size int(11) NOT NULL default '0',~~ ~~- `Status` tinyint(4) NOT NULL default '1',~~ ~~- CreatedOn int(11) unsigned NOT NULL default '0',~~ ~~- CreatedById int(11) NOT NULL default '-1',~~ ~~- MimeType varchar(255) NOT NULL default '',~~ ~~- PRIMARY KEY (FileId),~~ + FileId int(11) NOT NULL AUTO_INCREMENT, + ResourceId int(11) unsigned NOT NULL DEFAULT '0', + FileName varchar(255) NOT NULL DEFAULT '', + FilePath varchar(255) NOT NULL DEFAULT '', + Size int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + CreatedOn int(11) unsigned DEFAULT NULL, + CreatedById int(11) NOT NULL DEFAULT '-1', + MimeType varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (FileId), KEY ResourceId (ResourceId), KEY CreatedOn (CreatedOn), ~~- KEY Status (Status)~~ + KEY `Status` (`Status`) ); CREATE TABLE Relationship ( @@ -931,54 +931,54 @@ ); CREATE TABLE ImportScripts ( ~~- ImportId INT(11) NOT NULL auto_increment,~~ ~~- Name VARCHAR(255) NOT NULL DEFAULT '',~~ ~~- Description TEXT NOT NULL,~~ ~~- Prefix VARCHAR(10) NOT NULL DEFAULT '',~~ ~~- Module VARCHAR(50) NOT NULL DEFAULT '',~~ ~~- ExtraFields VARCHAR(255) NOT NULL DEFAULT '',~~ ~~- Type VARCHAR(10) NOT NULL DEFAULT '',~~ ~~- Status TINYINT NOT NULL,~~ + ImportId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + Description text, + Prefix varchar(10) NOT NULL DEFAULT '', + Module varchar(50) NOT NULL DEFAULT '', + ExtraFields varchar(255) NOT NULL DEFAULT '', + `Type` varchar(10) NOT NULL DEFAULT '', + `Status` tinyint(4) NOT NULL DEFAULT '1', PRIMARY KEY (ImportId), KEY Module (Module), ~~- KEY Status (Status)~~ + KEY `Status` (`Status`) ); CREATE TABLE StylesheetSelectors ( ~~- SelectorId int(11) NOT NULL auto_increment,~~ ~~- StylesheetId int(11) NOT NULL default '0',~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- SelectorName varchar(255) NOT NULL default '',~~ ~~- SelectorData text NOT NULL,~~ ~~- Description text NOT NULL,~~ ~~- Type tinyint(4) NOT NULL default '0',~~ ~~- AdvancedCSS text NOT NULL,~~ ~~- ParentId int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (SelectorId),~~ + SelectorId int(11) NOT NULL AUTO_INCREMENT, + StylesheetId int(11) NOT NULL DEFAULT '0', + `Name` varchar(255) NOT NULL DEFAULT '', + SelectorName varchar(255) NOT NULL DEFAULT '', + SelectorData text, + Description text, + `Type` tinyint(4) NOT NULL DEFAULT '0', + AdvancedCSS text, + ParentId int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (SelectorId), KEY StylesheetId (StylesheetId), KEY ParentId (ParentId), KEY `Type` (`Type`) ); CREATE TABLE Visits ( ~~- VisitId int(11) NOT NULL auto_increment,~~ ~~- VisitDate int(10) unsigned NOT NULL default '0',~~ ~~- Referer varchar(255) NOT NULL default '',~~ ~~- IPAddress varchar(15) NOT NULL default '',~~ ~~- AffiliateId int(10) unsigned NOT NULL default '0',~~ ~~- PortalUserId int(11) NOT NULL default '-2',~~ ~~- PRIMARY KEY (VisitId),~~ + VisitId int(11) NOT NULL AUTO_INCREMENT, + VisitDate int(10) unsigned DEFAULT NULL, + Referer varchar(255) NOT NULL DEFAULT '', + IPAddress varchar(15) NOT NULL DEFAULT '', + AffiliateId int(10) unsigned NOT NULL DEFAULT '0', + PortalUserId int(11) NOT NULL DEFAULT '-2', + PRIMARY KEY (VisitId), KEY PortalUserId (PortalUserId), KEY AffiliateId (AffiliateId), KEY VisitDate (VisitDate) ); CREATE TABLE ImportCache ( ~~- CacheId int(11) NOT NULL auto_increment,~~ ~~- CacheName varchar(255) NOT NULL default '',~~ ~~- VarName int(11) NOT NULL default '0',~~ ~~- VarValue text NOT NULL,~~ ~~- PRIMARY KEY (CacheId),~~ + CacheId int(11) NOT NULL AUTO_INCREMENT, + CacheName varchar(255) NOT NULL DEFAULT '', + VarName int(11) NOT NULL DEFAULT '0', + VarValue text, + PRIMARY KEY (CacheId), KEY CacheName (CacheName), KEY VarName (VarName) ); @@ -1004,19 +1004,19 @@ ); CREATE TABLE MailingLists ( ~~- MailingId int(10) unsigned NOT NULL auto_increment,~~ ~~- PortalUserId int(11) NOT NULL default '-1',~~ + MailingId int(10) unsigned NOT NULL AUTO_INCREMENT, + PortalUserId int(11) NOT NULL DEFAULT '-1', `To` longtext, ToParsed longtext, Attachments text, ~~- `Subject` varchar(255) NOT NULL,~~ + `Subject` varchar(255) NOT NULL DEFAULT '', MessageText longtext, MessageHtml longtext, ~~- `Status` tinyint(3) unsigned NOT NULL default '1',~~ ~~- EmailsQueued int(10) unsigned NOT NULL,~~ ~~- EmailsSent int(10) unsigned NOT NULL,~~ ~~- EmailsTotal int(10) unsigned NOT NULL,~~ ~~- PRIMARY KEY (MailingId),~~ + `Status` tinyint(3) unsigned NOT NULL DEFAULT '1', + EmailsQueued int(10) unsigned NOT NULL DEFAULT '0', + EmailsSent int(10) unsigned NOT NULL DEFAULT '0', + EmailsTotal int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (MailingId), KEY EmailsTotal (EmailsTotal), KEY EmailsSent (EmailsSent), KEY EmailsQueued (EmailsQueued), @@ -1038,22 +1038,22 @@ ); CREATE TABLE FormFields ( ~~- FormFieldId int(11) NOT NULL auto_increment,~~ ~~- FormId int(11) NOT NULL default '0',~~ ~~- Type int(11) NOT NULL default '0',~~ ~~- FieldName varchar(255) NOT NULL default '',~~ ~~- FieldLabel varchar(255) default NULL,~~ ~~- Heading varchar(255) default NULL,~~ ~~- Prompt varchar(255) default NULL,~~ ~~- ElementType varchar(50) NOT NULL default '',~~ ~~- ValueList varchar(255) default NULL,~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- IsSystem tinyint(3) unsigned NOT NULL default '0',~~ ~~- Required tinyint(1) NOT NULL default '0',~~ ~~- DisplayInGrid tinyint(1) NOT NULL default '1',~~ ~~- DefaultValue text NOT NULL,~~ ~~- Validation TINYINT NOT NULL DEFAULT '0',~~ ~~- PRIMARY KEY (FormFieldId),~~ + FormFieldId int(11) NOT NULL AUTO_INCREMENT, + FormId int(11) NOT NULL DEFAULT '0', + `Type` int(11) NOT NULL DEFAULT '0', + FieldName varchar(255) NOT NULL DEFAULT '', + FieldLabel varchar(255) DEFAULT NULL, + Heading varchar(255) DEFAULT NULL, + Prompt varchar(255) DEFAULT NULL, + ElementType varchar(50) NOT NULL DEFAULT '', + ValueList varchar(255) DEFAULT NULL, + Priority int(11) NOT NULL DEFAULT '0', + IsSystem tinyint(3) unsigned NOT NULL DEFAULT '0', + Required tinyint(1) NOT NULL DEFAULT '0', + DisplayInGrid tinyint(1) NOT NULL DEFAULT '1', + DefaultValue text, + Validation tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (FormFieldId), KEY `Type` (`Type`), KEY FormId (FormId), KEY Priority (Priority), @@ -1062,10 +1062,10 @@ ); CREATE TABLE FormSubmissions ( ~~- FormSubmissionId int(11) NOT NULL auto_increment,~~ ~~- FormId int(11) NOT NULL default '0',~~ ~~- SubmissionTime int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (FormSubmissionId),~~ + FormSubmissionId int(11) NOT NULL AUTO_INCREMENT, + FormId int(11) NOT NULL DEFAULT '0', + SubmissionTime int(11) DEFAULT NULL, + PRIMARY KEY (FormSubmissionId), KEY FormId (FormId), KEY SubmissionTime (SubmissionTime) ); @@ -1078,12 +1078,12 @@ ); CREATE TABLE Semaphores ( ~~- SemaphoreId int(11) NOT NULL auto_increment,~~ ~~- SessionKey int(10) unsigned NOT NULL,~~ ~~- Timestamp int(10) unsigned NOT NULL,~~ ~~- MainPrefix varchar(255) NOT NULL,~~ ~~- PRIMARY KEY (SemaphoreId),~~ + SemaphoreId int(11) NOT NULL AUTO_INCREMENT, + SessionKey int(10) unsigned NOT NULL DEFAULT '0', + `Timestamp` int(10) unsigned NOT NULL DEFAULT '0', + MainPrefix varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (SemaphoreId), KEY SessionKey (SessionKey), ~~- KEY Timestamp (Timestamp),~~ + KEY `Timestamp` (`Timestamp`), KEY MainPrefix (MainPrefix) ); \ No newline at end of file Index: core/install/upgrades.sql =================================================================== --- core/install/upgrades.sql (revision 12677) +++ core/install/upgrades.sql (working copy) @@ -1528,4 +1528,71 @@ CHANGE CachedTemplate CachedTemplate varchar(255) NOT NULL DEFAULT '', CHANGE ThemeId ThemeId int(10) unsigned NOT NULL DEFAULT '0'; ~~-ALTER TABLE UserSession CHANGE BrowserSignature BrowserSignature varchar(32) NOT NULL DEFAULT '';~~ \ No newline at end of file +ALTER TABLE UserSession CHANGE BrowserSignature BrowserSignature varchar(32) NOT NULL DEFAULT ''; + +ALTER TABLE ChangeLogs + CHANGE Changes Changes text NULL, + CHANGE OccuredOn OccuredOn INT(11) NULL DEFAULT NULL; + +ALTER TABLE EmailLog CHANGE EventParams EventParams text NULL; +ALTER TABLE FormFields CHANGE DefaultValue DefaultValue text NULL; +ALTER TABLE ImportCache CHANGE VarValue VarValue text NULL; +ALTER TABLE ImportScripts CHANGE Description Description text NULL; +ALTER TABLE PersistantSessionData CHANGE VariableValue VariableValue text NULL; + +ALTER TABLE Phrase + CHANGE `Translation` `Translation` text NULL, + CHANGE PhraseKey PhraseKey VARCHAR(255) NOT NULL DEFAULT '', + CHANGE LastChanged LastChanged INT(10) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE PhraseCache CHANGE PhraseList PhraseList text NULL; + +ALTER TABLE Stylesheets + CHANGE AdvancedCSS AdvancedCSS text NULL, + CHANGE LastCompiled LastCompiled INT(10) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE StylesheetSelectors + CHANGE SelectorData SelectorData text NULL, + CHANGE Description Description text NULL, + CHANGE AdvancedCSS AdvancedCSS text NULL; + +ALTER TABLE Category + CHANGE `Status` `Status` TINYINT(4) NOT NULL DEFAULT '1', + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL, + CHANGE Modified Modified INT(11) NULL DEFAULT NULL; + +ALTER TABLE Language CHANGE UserDocsUrl UserDocsUrl VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE MailingLists + CHANGE Subject Subject VARCHAR(255) NOT NULL DEFAULT '', + CHANGE EmailsQueued EmailsQueued INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE EmailsSent EmailsSent INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE EmailsTotal EmailsTotal INT(10) UNSIGNED NOT NULL DEFAULT '0'; + +ALTER TABLE EmailQueue + CHANGE MailingId MailingId INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE Queued Queued INT(10) UNSIGNED NULL DEFAULT NULL, + CHANGE LastSendRetry LastSendRetry INT(10) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE ImportScripts CHANGE `Status` `Status` TINYINT(4) NOT NULL DEFAULT '1'; + +ALTER TABLE Semaphores + CHANGE SessionKey SessionKey INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE `Timestamp` `Timestamp` INT(10) UNSIGNED NOT NULL DEFAULT '0', + CHANGE MainPrefix MainPrefix VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE Skins + CHANGE LogoBottom LogoBottom VARCHAR(255) NOT NULL DEFAULT '', + CHANGE LogoLogin LogoLogin VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE ItemReview CHANGE ReviewText ReviewText LONGTEXT NULL; +ALTER TABLE SessionData CHANGE VariableValue VariableValue LONGTEXT NULL; + +ALTER TABLE PortalUser + CHANGE `Status` `Status` TINYINT(4) NOT NULL DEFAULT '1', + CHANGE Modified Modified INT(11) NULL DEFAULT NULL; + +ALTER TABLE ItemFiles CHANGE CreatedOn CreatedOn INT(11) UNSIGNED NULL DEFAULT NULL; +ALTER TABLE FormSubmissions CHANGE SubmissionTime SubmissionTime INT(11) NULL DEFAULT NULL; +ALTER TABLE SessionLogs CHANGE SessionStart SessionStart INT(11) NULL DEFAULT NULL; +ALTER TABLE Visits CHANGE VisitDate VisitDate INT(10) UNSIGNED NULL DEFAULT NULL; \ No newline at end of file Index: core/units/categories/categories_config.php =================================================================== --- core/units/categories/categories_config.php (revision 12677) +++ core/units/categories/categories_config.php (working copy) @@ -295,7 +295,7 @@ 'Filename' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), 'AutomaticFilename' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1), 'Description' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => null), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'EditorsPick' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 1), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0), @@ -312,7 +312,7 @@ 'HotItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'NewItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'PopItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), ~~- 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),~~ + 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => 0), 'CachedTemplate' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), Index: core/units/email_queue/email_queue_config.php =================================================================== --- core/units/email_queue/email_queue_config.php (revision 12677) +++ core/units/email_queue/email_queue_config.php (working copy) @@ -68,9 +68,9 @@ 'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'MessageHeaders' => Array ('type' => 'string', 'default' => NULL), 'MessageBody' => Array ('type' => 'string', 'default' => NULL), ~~- 'Queued' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'Queued' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'SendRetries' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'MailingId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ), Index: core/units/files/files_config.php =================================================================== --- core/units/files/files_config.php (revision 12677) +++ core/units/files/files_config.php (working copy) @@ -78,7 +78,7 @@ ), 'Size' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => '#NOW#'),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'CreatedById' => Array ('type' => 'int', 'not_null' => 1, 'default' => -1), 'MimeType' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), ), Index: core/units/form_fields/form_fields_config.php =================================================================== --- core/units/form_fields/form_fields_config.php (revision 12677) +++ core/units/form_fields/form_fields_config.php (working copy) @@ -74,7 +74,7 @@ 'IsSystem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'Required' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'DisplayInGrid' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), ~~- 'DefaultValue' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'DefaultValue' => Array('type' => 'string', 'default' => NULL), 'Validation' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_None', 1 => 'la_ValidationEmail'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), ), Index: core/units/form_submissions/form_submissions_config.php =================================================================== --- core/units/form_submissions/form_submissions_config.php (revision 12677) +++ core/units/form_submissions/form_submissions_config.php (working copy) @@ -87,7 +87,7 @@ 'Fields' => Array( 'FormSubmissionId' => Array('type' => 'int', 'not_null' => 1,'default' => 0), 'FormId' => Array('type' => 'int','not_null' => '1','default' => 0), ~~- 'SubmissionTime' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#', 'not_null' => '1' ),~~ + 'SubmissionTime' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), ), 'VirtualFields' => Array( ), Index: core/units/logs/change_logs/change_logs_config.php =================================================================== --- core/units/logs/change_logs/change_logs_config.php (revision 12677) +++ core/units/logs/change_logs/change_logs_config.php (working copy) @@ -105,7 +105,7 @@ 'use_phrases' => 1, 'not_null' => 1, 'default' => 0 ), ~~- 'OccuredOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'not_null' => 1, 'default' => 0),~~ + 'OccuredOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'default' => NULL), 'Prefix' => Array ( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT DISTINCT %s FROM '.TABLE_PREFIX.'ChangeLogs ORDER BY Phrase', @@ -115,7 +115,7 @@ 'max_len' => 255, 'not_null' => 1, 'default' => '' ), 'ItemId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'Changes' => Array ('type' => 'string', 'formatter' => 'kChangesFormatter', 'not_null' => 1, 'default' => ''),~~ + 'Changes' => Array ('type' => 'string', 'formatter' => 'kChangesFormatter', 'default' => NULL), 'MasterPrefix' => Array ( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT DISTINCT %s FROM '.TABLE_PREFIX.'ChangeLogs ORDER BY Phrase', Index: core/units/logs/email_logs/email_logs_config.php =================================================================== --- core/units/logs/email_logs/email_logs_config.php (revision 12677) +++ core/units/logs/email_logs/email_logs_config.php (working copy) @@ -69,7 +69,7 @@ 'subject' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), 'timestamp' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'event' => Array ('type' => 'string', 'max_len' => 100, 'default' => NULL), ~~- 'EventParams' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'EventParams' => Array ('type' => 'string', 'default' => NULL), ), 'Grids' => Array ( Index: core/units/logs/session_logs/session_logs_config.php =================================================================== --- core/units/logs/session_logs/session_logs_config.php (revision 12677) +++ core/units/logs/session_logs/session_logs_config.php (working copy) @@ -92,14 +92,14 @@ 'use_phrases' => 1, 'not_null' => 1, 'default' => 1 ), ~~- 'SessionStart' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'time_format' => 'H:i:s', 'default' => 0),~~ + 'SessionStart' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'default' => NULL), 'SessionEnd' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'default' => NULL), 'IP' => Array ('type' => 'string', 'max_len' => 15, 'not_null' => 1, 'default' => ''), 'AffectedItems' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ), 'VirtualFields' => Array( ~~- 'Duration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'date_format' => '', 'time_format' => 'H:i:s', 'use_timezone' => false, 'default' => 0),~~ + 'Duration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'date_format' => '', 'time_format' => 'H:i:s', 'use_timezone' => false, 'default' => NULL), ), 'Grids' => Array ( Index: core/units/phrases/phrases_config.php =================================================================== --- core/units/phrases/phrases_config.php (revision 12677) +++ core/units/phrases/phrases_config.php (working copy) @@ -135,8 +135,8 @@ 'required' => 1, 'unique' => Array ('LanguageId'), 'not_null' => 1, 'default' => '' ), ~~- 'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => NULL),~~ ~~- 'Translation' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), + 'Translation' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'using_fck' => 1, 'default' => NULL), 'PhraseType' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_PhraseType_Front', 1 => 'la_PhraseType_Admin', 2 => 'la_PhraseType_Both'), 'use_phrases' => 1, @@ -150,7 +150,7 @@ 'not_null' => 1, 'default' => 0 ), ~~- 'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'LastChangeIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), 'Module' => Array ( 'type' => 'string', Index: core/units/reviews/reviews_config.php =================================================================== --- core/units/reviews/reviews_config.php (revision 12677) +++ core/units/reviews/reviews_config.php (working copy) @@ -165,7 +165,7 @@ 'Fields' => Array ( 'ReviewId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'CreatedOn' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default'=>'#NOW#'), ~~- 'ReviewText' => Array('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'ReviewText' => Array('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'using_fck' => 1, 'default' => NULL), 'Rating' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_None', 1 => 'lu_Rating_1', 2 => 'lu_Rating_2', 3 => 'lu_Rating_3', 4 => 'lu_Rating_4', 5 => 'lu_Rating_5'), 'use_phrases' => 1, 'min_value_inc' => 0, 'max_value_inc' => 5, 'default' => 0), 'IPAddress' => Array('type'=>'string', 'max_value_inc'=>15, 'not_null'=>1, 'default'=>'', ), 'ItemId' => Array('type'=>'int','not_null'=>1,'default'=>0), Index: core/units/selectors/selectors_config.php =================================================================== --- core/units/selectors/selectors_config.php (revision 12677) +++ core/units/selectors/selectors_config.php (working copy) @@ -105,10 +105,10 @@ 'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'current_table_only' => 1, 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'current_table_only' => 1, 'not_null' => '1','default' => '','required'=>1), ~~- 'SelectorData' => Array('type' => 'string', 'not_null' => '1','default' => ''),~~ ~~- 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'SelectorData' => Array('type' => 'string', 'default' => NULL), + 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), ~~- 'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'required' => 1, 'not_null' => 1, 'default' => 0), ), Index: core/units/structure/structure_config.php =================================================================== --- core/units/structure/structure_config.php (revision 12677) +++ core/units/structure/structure_config.php (working copy) @@ -108,7 +108,7 @@ 'Filename' => Array('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1), 'AutomaticFilename' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), 'Description' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null), ~~- 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1),~~ + 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'EditorsPick' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 1), 'Priority' => Array('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => array(), 'required' => 1, 'default' => 0), @@ -125,7 +125,7 @@ 'HotItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'NewItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'PopItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), ~~- 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),~~ + 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'ModifiedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => 0), 'CachedTemplate' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), @@ -139,7 +139,7 @@ LEFT JOIN ' . TABLE_PREFIX . 'Theme AS t ON t.ThemeId = tf.ThemeId WHERE (t.Enabled = 1) AND (tf.FileName NOT LIKE "%%.elm.tpl") AND (tf.FileName NOT LIKE "%%.des.tpl") AND (tf.FilePath = "/designs")', 'option_key_field' => 'Value', 'option_title_field' => 'Title', ~~- /*'required' => 1,*/ 'default' => null~~ + 'not_null' => 1, 'default' => CATEGORY_TEMPLATE_INHERIT ), 'UseExternalUrl' => Array ( Index: core/units/stylesheets/stylesheets_config.php =================================================================== --- core/units/stylesheets/stylesheets_config.php (revision 12677) +++ core/units/stylesheets/stylesheets_config.php (working copy) @@ -152,8 +152,8 @@ 'StylesheetId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''), ~~- 'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ ~~- 'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'Enabled' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 0), ), Index: core/units/user_profile/user_profile_config.php =================================================================== --- core/units/user_profile/user_profile_config.php (revision 12677) +++ core/units/user_profile/user_profile_config.php (working copy) @@ -44,6 +44,6 @@ 'VariableId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'VariableName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), ~~- 'VariableValue' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'VariableValue' => Array ('type' => 'string', 'default' => NULL), ), ); \ No newline at end of file Index: core/units/users/users_config.php =================================================================== --- core/units/users/users_config.php (revision 12677) +++ core/units/users/users_config.php (working copy) @@ -380,7 +380,7 @@ 'not_null' => '1','default' => ''), 'ResourceId' => Array('type' => 'int','not_null' => 1, 'default' => 0), 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Enabled', 0=>'la_Disabled', 2=>'la_Pending'), 'use_phrases'=>1, 'not_null' => '1','default' => 2), ~~- 'Modified' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1', 'default' => '#NOW#' ),~~ + 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'dob' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => null), 'tz' => Array('type' => 'int','default' => 0), 'ip' => Array('type' => 'string','default' => null), Index: core/units/visits/visits_config.php =================================================================== --- core/units/visits/visits_config.php (revision 12677) +++ core/units/visits/visits_config.php (working copy) @@ -129,7 +129,7 @@ 'Fields' => Array ( 'VisitId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'not_null' => 1, 'default' => 0),~~ + 'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'default' => NULL), 'Referer' => Array ('type' => 'string','not_null' => '1','default' => ''), 'IPAddress' => Array ('type' => 'string','not_null' => '1','default' => ''), 'AffiliateId' => Array ('type' => 'int','formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field' => 'AffiliateId','left_title_field' => 'Login','not_null'=>1,'default'=>0), Index: custom/install/install_schema.sql =================================================================== --- custom/install/install_schema.sql (revision 12677) +++ custom/install/install_schema.sql (working copy) @@ -1,20 +1,20 @@ # place here only sql queries, that were executed on live AND dev sites !!! CREATE TABLE Widgets ( ~~- WidgetId int(11) NOT NULL auto_increment,~~ ~~- Title varchar(255) NOT NULL default '',~~ + WidgetId int(11) NOT NULL AUTO_INCREMENT, + Title varchar(255) NOT NULL DEFAULT '', Description text, ~~- Email varchar(255) NOT NULL default '',~~ ~~- `Type` tinyint(4) NOT NULL default '1',~~ ~~- Phone varchar(50) NOT NULL default '',~~ ~~- Qty double NOT NULL default '0',~~ ~~- `Status` tinyint(4) NOT NULL default '2',~~ ~~- CreatedOn int(11) NOT NULL default '0',~~ ~~- Good tinyint(4) NOT NULL default '0',~~ ~~- BirthTime int(10) unsigned default NULL,~~ ~~- `Image` text,~~ + Email varchar(255) NOT NULL DEFAULT '', + `Type` tinyint(4) NOT NULL DEFAULT '1', + Phone varchar(50) NOT NULL DEFAULT '', + Qty double NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '2', + CreatedOn int(11) DEFAULT NULL, + Good tinyint(4) NOT NULL DEFAULT '0', + BirthTime int(10) unsigned DEFAULT NULL, + Image text, `DataFile` text, ~~- PRIMARY KEY (WidgetId)~~ + PRIMARY KEY (WidgetId) ); # ===== SQLs above this line already on LIVE ================================================================================================ Index: custom/install/upgrades.sql =================================================================== --- custom/install/upgrades.sql (revision 12677) +++ custom/install/upgrades.sql (working copy) @@ -4,4 +4,5 @@ UPDATE Modules SET LoadOrder = 10 WHERE `Name` = 'Custom'; # ===== v 1.0.2 ===== +ALTER TABLE Widgets CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL; UPDATE Modules SET TemplatePath = 'custom/' WHERE Name = 'Custom'; Index: custom/units/sections/sections_config.php =================================================================== --- custom/units/sections/sections_config.php (revision 12677) +++ custom/units/sections/sections_config.php (working copy) @@ -69,7 +69,7 @@ 'PermSection' => Array ('main' => 'custom', 'email' => 'custom:configuration_email'), # New sections in left navigation - /* + 'Sections' => Array ( 'custom' => Array ( 'parent' => 'in-portal:root', @@ -83,6 +83,4 @@ ), ), ~~- */~~ - ); \ No newline at end of file Index: custom/units/widgets/widgets_config.php =================================================================== --- custom/units/widgets/widgets_config.php (revision 12677) +++ custom/units/widgets/widgets_config.php (working copy) @@ -129,7 +129,7 @@ ), 'CreatedOn' => Array ( 'type' => 'int', 'formatter' => 'kDateFormatter', ~~- 'time_format' => '', 'input_time_format' => '', 'default'=>'#NOW#', 'not_null' => true),~~ + 'time_format' => '', 'input_time_format' => '', 'default'=>'#NOW#', 'default' => NULL), 'Good' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', Index: in-auction/install/install_schema.sql =================================================================== --- in-auction/install/install_schema.sql (revision 12677) +++ in-auction/install/install_schema.sql (working copy) @@ -1,12 +1,12 @@ ALTER TABLE PortalUser ~~- ADD EbayLogin VARCHAR( 255 ) NULL,~~ + ADD EbayLogin VARCHAR(255) NULL, ADD INDEX ( EbayLogin ), ~~- ADD EbayEIASToken VARCHAR( 255 ) NOT NULL,~~ + ADD EbayEIASToken VARCHAR(255) NOT NULL DEFAULT '', ADD INDEX ( EbayEIASToken ); ALTER TABLE Products ~~- ADD LastListingId INT( 11 ) NOT NULL,~~ ~~- ADD ScheduleId INT( 11 ) NOT NULL,~~ + ADD LastListingId INT(11) NOT NULL DEFAULT '0', + ADD ScheduleId INT(11) NOT NULL DEFAULT '0', ADD INDEX ( ScheduleId ); CREATE TABLE eBayAuctionCategories ( @@ -70,9 +70,9 @@ ); CREATE TABLE eBayCharacteristicsSets ( ~~- `SetId` int(11) NOT NULL default '0',~~ ~~- `XML` longtext NOT NULL,~~ ~~- PRIMARY KEY (`SetId`)~~ + SetId int(11) NOT NULL DEFAULT '0', + XML longtext, + PRIMARY KEY (SetId) ); CREATE TABLE eBayDefaultAttributeValues ( @@ -85,18 +85,18 @@ ); CREATE TABLE eBayErrorLog ( ~~- `LogId` int(11) NOT NULL auto_increment,~~ ~~- `RequestType` varchar(255) NOT NULL default '',~~ ~~- `RequestTime` int(11) NOT NULL default '0',~~ ~~- `DurationSeconds` int(11) default '0',~~ ~~- `AnswerStatus` varchar(255) default '',~~ ~~- `ListingId` int(11) default '0',~~ ~~- `Errors` text NOT NULL,~~ ~~- `Request` text NOT NULL,~~ ~~- `Answer` text NOT NULL,~~ ~~- `AnswerFile` varchar(255) NOT NULL default '',~~ ~~- PRIMARY KEY (`LogId`),~~ ~~- KEY `RequestTime` (`RequestTime`)~~ + LogId int(11) NOT NULL AUTO_INCREMENT, + RequestType varchar(255) NOT NULL DEFAULT '', + RequestTime int(11) DEFAULT NULL, + DurationSeconds int(11) DEFAULT '0', + AnswerStatus varchar(255) DEFAULT '', + ListingId int(11) DEFAULT '0', + `Errors` text, + Request text, + Answer text, + AnswerFile varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (LogId), + KEY RequestTime (RequestTime) ); CREATE TABLE eBayFieldOptions ( @@ -109,71 +109,71 @@ ); CREATE TABLE eBayListingDetailTemplates ( ~~- `DetailTemplateId` int(11) NOT NULL auto_increment,~~ ~~- `TemplateName` varchar(255) NOT NULL default '',~~ ~~- `TemplateBody` text NOT NULL,~~ ~~- PRIMARY KEY (`DetailTemplateId`)~~ + DetailTemplateId int(11) NOT NULL AUTO_INCREMENT, + TemplateName varchar(255) NOT NULL DEFAULT '', + TemplateBody text, + PRIMARY KEY (DetailTemplateId) ); CREATE TABLE eBayListingLog ( ~~- `ListingLogId` int(11) NOT NULL auto_increment,~~ ~~- `ProductListingId` int(11) NOT NULL default '0',~~ ~~- `CreatedOn` int(11) NOT NULL default '0',~~ ~~- `LogData` text NOT NULL,~~ ~~- PRIMARY KEY (`ListingLogId`),~~ ~~- KEY `ProductListingId` (`ProductListingId`),~~ ~~- KEY `CreatedOn` (`CreatedOn`)~~ + ListingLogId int(11) NOT NULL AUTO_INCREMENT, + ProductListingId int(11) NOT NULL DEFAULT '0', + CreatedOn int(11) NOT NULL DEFAULT '0', + LogData text, + PRIMARY KEY (ListingLogId), + KEY ProductListingId (ProductListingId), + KEY CreatedOn (CreatedOn) ); CREATE TABLE eBayListings ( ~~- `ListingId` int(11) NOT NULL auto_increment,~~ ~~- `ProductId` int(11) NOT NULL default '0',~~ ~~- `ListingType` tinyint(1) NOT NULL default '0',~~ ~~- `Status` tinyint(1) NOT NULL default '0',~~ ~~- `eBayListingId` varchar(255) default NULL,~~ ~~- `BidCounter` int(11) NOT NULL default '0',~~ ~~- `DetailTemplateBody` text ,~~ ~~- `ImageUrls` text ,~~ ~~- `UseGallery` tinyint(1) default '0',~~ ~~- `UseGalleryPlus` tinyint(1) default '0',~~ ~~- `CreatedOn` int(11) default '0',~~ ~~- `PaymentMethod` varchar(255) default NULL,~~ ~~- `PayPalSellerEmail` varchar(255) default NULL,~~ ~~- `AutoRelist` tinyint(1) default '0',~~ ~~- `PaymentInstructions` text ,~~ ~~- `OriginalListingId` int(11) NOT NULL default '0',~~ ~~- `Modified` int(11) default '0',~~ ~~- `StoreBuyItNowPrice` double default NULL,~~ ~~- `ListingQuantity` int(11) NOT NULL default '0',~~ ~~- `QuantityPaid` int(11) NOT NULL default '0',~~ ~~- `QuantitySold` int(11) NOT NULL default '0',~~ ~~- `StoreListingDuration` tinyint(2) default NULL,~~ ~~- `SendError` text ,~~ ~~- `AuctionListingDuration` tinyint(2) default NULL,~~ ~~- `AuctionStartPrice` double default NULL,~~ ~~- `AuctionReservePrice` double default NULL,~~ ~~- `AuctionBuyItNowPrice` double default NULL,~~ ~~- `EnhancementBoldTitle` tinyint(1) default NULL,~~ ~~- `EnhancementBorder` tinyint(1) default NULL,~~ ~~- `EnhancementFeatured` tinyint(1) default NULL,~~ ~~- `EnhancementHighlight` tinyint(1) default NULL,~~ ~~- `EnhancementHomePageFeatured` tinyint(1) default NULL,~~ ~~- `Fixed` tinyint(1) default NULL,~~ ~~- `LogId` int(11) default NULL,~~ ~~- `ShippingDetails` text ,~~ ~~- `CurrentPrice` decimal(20,2) default NULL,~~ ~~- `Archived` int(11) NOT NULL default '0',~~ ~~- `RequestParams` longtext NOT NULL,~~ ~~- `ClosedOn` int(11) default NULL,~~ ~~- `ListingFee` decimal(20,2) default NULL,~~ ~~- `Winner` int(11) NOT NULL default '0',~~ ~~- `Hits` INT( 11 ) NOT NULL DEFAULT '0',~~ ~~- PRIMARY KEY (`ListingId`),~~ ~~- KEY `CategoryId` (`ProductId`),~~ ~~- KEY `OriginalListingId` (`OriginalListingId`),~~ ~~- KEY `Archived` (`Archived`),~~ ~~- KEY `Winner` (`Winner`),~~ ~~- KEY `LogId` (`LogId`)~~ + ListingId int(11) NOT NULL AUTO_INCREMENT, + ProductId int(11) NOT NULL DEFAULT '0', + ListingType tinyint(1) NOT NULL DEFAULT '0', + `Status` tinyint(1) NOT NULL DEFAULT '0', + eBayListingId varchar(255) DEFAULT NULL, + BidCounter int(11) NOT NULL DEFAULT '0', + DetailTemplateBody text, + ImageUrls text, + UseGallery tinyint(1) DEFAULT '0', + UseGalleryPlus tinyint(1) DEFAULT '0', + CreatedOn int(11) DEFAULT '0', + PaymentMethod varchar(255) DEFAULT NULL, + PayPalSellerEmail varchar(255) DEFAULT NULL, + AutoRelist tinyint(1) DEFAULT '0', + PaymentInstructions text, + OriginalListingId int(11) NOT NULL DEFAULT '0', + Modified int(11) DEFAULT '0', + StoreBuyItNowPrice double DEFAULT NULL, + ListingQuantity int(11) NOT NULL DEFAULT '0', + QuantityPaid int(11) NOT NULL DEFAULT '0', + QuantitySold int(11) NOT NULL DEFAULT '0', + StoreListingDuration tinyint(2) DEFAULT NULL, + SendError text, + AuctionListingDuration tinyint(2) DEFAULT NULL, + AuctionStartPrice double DEFAULT NULL, + AuctionReservePrice double DEFAULT NULL, + AuctionBuyItNowPrice double DEFAULT NULL, + EnhancementBoldTitle tinyint(1) DEFAULT NULL, + EnhancementBorder tinyint(1) DEFAULT NULL, + EnhancementFeatured tinyint(1) DEFAULT NULL, + EnhancementHighlight tinyint(1) DEFAULT NULL, + EnhancementHomePageFeatured tinyint(1) DEFAULT NULL, + `Fixed` tinyint(1) DEFAULT NULL, + LogId int(11) DEFAULT NULL, + ShippingDetails text, + CurrentPrice decimal(20,2) DEFAULT NULL, + Archived int(11) DEFAULT NULL, + RequestParams longtext, + ClosedOn int(11) DEFAULT NULL, + ListingFee decimal(20,2) DEFAULT NULL, + Winner int(11) NOT NULL DEFAULT '0', + Hits int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (ListingId), + KEY CategoryId (ProductId), + KEY OriginalListingId (OriginalListingId), + KEY Archived (Archived), + KEY Winner (Winner), + KEY LogId (LogId) ); CREATE TABLE eBayOrderItems ( @@ -199,60 +199,60 @@ ); CREATE TABLE eBayProductListings ( ~~- `ProductListingId` int(11) NOT NULL auto_increment,~~ ~~- `ProductId` int(11) NOT NULL default '0',~~ ~~- `SubTitle` varchar(255) default NULL,~~ ~~- `DetailTemplateId` int(11) default NULL,~~ ~~- `UseGallery` tinyint(1) default NULL,~~ ~~- `UseGalleryPlus` tinyint(1) default NULL,~~ ~~- `HitCounter` varchar(255) default NULL,~~ ~~- `AuctionPrimaryCategoryId` int(11) default NULL,~~ ~~- `AuctionSecondaryCategoryId` int(11) default NULL,~~ ~~- `AuctionListingDuration` int(11) default NULL,~~ ~~- `StorePrimaryCategoryId` int(11) default NULL,~~ ~~- `StoreSecondaryCategoryId` int(11) default NULL,~~ ~~- `StoreListingDuration` int(11) default NULL,~~ ~~- `PaymentMethod` varchar(255) default NULL,~~ ~~- `PayPalSellerEmail` varchar(255) default NULL,~~ ~~- `AutoRelist` tinyint(1) default NULL,~~ ~~- `PaymentInstructions` text,~~ ~~- `ListingTitle` varchar(255) default NULL,~~ ~~- `ListingDescription` text,~~ ~~- `AuctionStartPrice` double default NULL,~~ ~~- `AuctionBuyItNowPrice` double default NULL,~~ ~~- `AuctionReservePrice` double default NULL,~~ ~~- `StoreBuyItNowPrice` double default NULL,~~ ~~- `HasReturnPolicy` tinyint(1) default NULL,~~ ~~- `ReturnPolicyDetails` text,~~ ~~- `RefundType` int(11) default NULL,~~ ~~- `ReturnRequestDays` int(11) default NULL,~~ ~~- `InsuranceType` tinyint(1) default NULL,~~ ~~- `InsuranceAmount` double default NULL,~~ ~~- `UseInsurance` varchar(255) default NULL,~~ ~~- `ShippingAsParent` tinyint(1) NOT NULL default '1',~~ ~~- `Images` text NOT NULL,~~ ~~- `GetItFast` tinyint(1) default NULL,~~ ~~- `ItemSpecifics` text,~~ ~~- `CustomItemSpecifics` text,~~ ~~- `BlockScheduling` tinyint(1) NOT NULL default '0',~~ ~~- PRIMARY KEY (`ProductListingId`),~~ ~~- KEY `CategoryId` (`ProductId`)~~ + ProductListingId int(11) NOT NULL AUTO_INCREMENT, + ProductId int(11) NOT NULL DEFAULT '0', + SubTitle varchar(255) DEFAULT NULL, + DetailTemplateId int(11) DEFAULT NULL, + UseGallery tinyint(1) DEFAULT NULL, + UseGalleryPlus tinyint(1) DEFAULT NULL, + HitCounter varchar(255) DEFAULT NULL, + AuctionPrimaryCategoryId int(11) DEFAULT NULL, + AuctionSecondaryCategoryId int(11) DEFAULT NULL, + AuctionListingDuration int(11) DEFAULT NULL, + StorePrimaryCategoryId int(11) DEFAULT NULL, + StoreSecondaryCategoryId int(11) DEFAULT NULL, + StoreListingDuration int(11) DEFAULT NULL, + PaymentMethod varchar(255) DEFAULT NULL, + PayPalSellerEmail varchar(255) DEFAULT NULL, + AutoRelist tinyint(1) DEFAULT NULL, + PaymentInstructions text, + ListingTitle varchar(255) DEFAULT NULL, + ListingDescription text, + AuctionStartPrice double DEFAULT NULL, + AuctionBuyItNowPrice double DEFAULT NULL, + AuctionReservePrice double DEFAULT NULL, + StoreBuyItNowPrice double DEFAULT NULL, + HasReturnPolicy tinyint(1) DEFAULT NULL, + ReturnPolicyDetails text, + RefundType int(11) DEFAULT NULL, + ReturnRequestDays int(11) DEFAULT NULL, + InsuranceType tinyint(1) DEFAULT NULL, + InsuranceAmount double DEFAULT NULL, + UseInsurance varchar(255) DEFAULT NULL, + ShippingAsParent tinyint(1) NOT NULL DEFAULT '1', + Images text, + GetItFast tinyint(1) DEFAULT NULL, + ItemSpecifics text, + CustomItemSpecifics text, + BlockScheduling tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (ProductListingId), + KEY CategoryId (ProductId) ); CREATE TABLE eBaySchedules ( ~~- `ScheduleId` int(11) NOT NULL auto_increment,~~ ~~- `ScheduleName` varchar(255) NOT NULL default '',~~ ~~- `ListingQuantity` int(11) NOT NULL default '1',~~ ~~- `WeekDays` varchar(255) NOT NULL default '',~~ ~~- `StartDate` int(11) NOT NULL default '0',~~ ~~- `StartTime` int(11) NOT NULL default '0',~~ ~~- `EndTime` int(11) NOT NULL default '0',~~ ~~- `ListingType` tinyint(1) NOT NULL default '1',~~ ~~- `ContinueUntilQty` int(11) NOT NULL default '0',~~ ~~- `LastProcessed` int(11) default NULL,~~ ~~- `Status` TINYINT( 1 ) NOT NULL DEFAULT '1',~~ ~~- PRIMARY KEY (`ScheduleId`),~~ ~~- KEY `LastProcessed` (`LastProcessed`)~~ + ScheduleId int(11) NOT NULL AUTO_INCREMENT, + ScheduleName varchar(255) NOT NULL DEFAULT '', + ListingQuantity int(11) NOT NULL DEFAULT '1', + WeekDays varchar(255) NOT NULL DEFAULT '', + StartDate int(11) DEFAULT NULL, + StartTime int(11) DEFAULT NULL, + EndTime int(11) DEFAULT NULL, + ListingType tinyint(1) NOT NULL DEFAULT '1', + ContinueUntilQty int(11) NOT NULL DEFAULT '0', + LastProcessed int(11) DEFAULT NULL, + `Status` tinyint(1) NOT NULL DEFAULT '1', + PRIMARY KEY (ScheduleId), + KEY LastProcessed (LastProcessed) ); CREATE TABLE eBayShipping ( @@ -271,10 +271,10 @@ ); CREATE TABLE eBaySiteWideCharacteristicSets ( ~~- `AttributeSetId` int(11) NOT NULL default '0',~~ ~~- `ExcludeCategoryIds` text NOT NULL,~~ ~~- `Name` varchar(255) NOT NULL default '',~~ ~~- PRIMARY KEY (`AttributeSetId`)~~ + AttributeSetId int(11) NOT NULL DEFAULT '0', + ExcludeCategoryIds text, + `Name` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (AttributeSetId) ); CREATE TABLE eBayStoreCategories ( @@ -286,9 +286,9 @@ ); CREATE TABLE eBayListingHits ( ~~- `ListingId` INT( 11 ) NOT NULL ,~~ ~~- `IP` CHAR( 15 ) NOT NULL ,~~ ~~- `LastHitTime` INT( 11 ) NOT NULL ,~~ ~~- PRIMARY KEY ( `ListingId` , `IP` )~~ + ListingId int(11) NOT NULL, + IP char(15) NOT NULL DEFAULT '', + LastHitTime int(11) DEFAULT NULL, + PRIMARY KEY (ListingId,IP) ); Index: in-auction/install/upgrades.sql =================================================================== --- in-auction/install/upgrades.sql (revision 12677) +++ in-auction/install/upgrades.sql (working copy) @@ -4,4 +4,37 @@ INSERT INTO Permissions VALUES (DEFAULT, 'ebay:setting_folder.view', 11, 1, 1, 0); # ===== v 5.0.1 ===== ~~-ALTER TABLE eBaySchedules CHANGE LastProcessed LastProcessed INT( 11 ) NULL DEFAULT '0';~~ \ No newline at end of file +ALTER TABLE eBaySchedules CHANGE LastProcessed LastProcessed INT( 11 ) NULL DEFAULT '0'; + +# ===== v 5.0.2 ===== +ALTER TABLE eBayErrorLog + CHANGE Errors Errors text NULL, + CHANGE Request Request text NULL, + CHANGE Answer Answer text NULL, + CHANGE RequestTime RequestTime INT(11) NULL DEFAULT NULL; + +ALTER TABLE eBayListingDetailTemplates CHANGE TemplateBody TemplateBody text NULL; +ALTER TABLE eBayListingLog CHANGE LogData LogData text NULL; +ALTER TABLE eBayProductListings CHANGE Images Images text NULL; +ALTER TABLE eBaySiteWideCharacteristicSets CHANGE ExcludeCategoryIds ExcludeCategoryIds text NULL; + +ALTER TABLE eBayListingHits + CHANGE IP IP CHAR(15) NOT NULL DEFAULT '', + CHANGE LastHitTime LastHitTime INT(11) NULL DEFAULT NULL; + +ALTER TABLE PortalUser CHANGE EbayEIASToken EbayEIASToken VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE Products + CHANGE LastListingId LastListingId INT( 11 ) NOT NULL DEFAULT '0', + CHANGE ScheduleId ScheduleId INT( 11 ) NOT NULL DEFAULT '0'; + +ALTER TABLE eBayCharacteristicsSets CHANGE XML XML LONGTEXT NULL; + +ALTER TABLE eBayListings + CHANGE RequestParams RequestParams LONGTEXT NULL, + CHANGE Archived Archived INT(11) NULL DEFAULT NULL; + +ALTER TABLE eBaySchedules + CHANGE StartDate StartDate INT(11) NULL DEFAULT NULL, + CHANGE StartTime StartTime INT(11) NULL DEFAULT NULL, + CHANGE EndTime EndTime INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-auction/units/detail_template/detail_template_config.php =================================================================== --- in-auction/units/detail_template/detail_template_config.php (revision 12677) +++ in-auction/units/detail_template/detail_template_config.php (working copy) @@ -90,7 +90,7 @@ 'Fields' => Array( 'DetailTemplateId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'TemplateName' => Array('type' => 'string','not_null' => '1','default' => '', 'required'=>true,'max_len'=>255), ~~- 'TemplateBody' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => '1', 'using_fck' => 1, 'default' => ''),~~ + 'TemplateBody' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), ), Index: in-auction/units/error_log/error_log_config.php =================================================================== --- in-auction/units/error_log/error_log_config.php (revision 12677) +++ in-auction/units/error_log/error_log_config.php (working copy) @@ -88,13 +88,13 @@ 'Fields' => Array ( 'LogId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'RequestType' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), ~~- 'RequestTime' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kDateFormatter', 'default' => '#NOW#',),~~ + 'RequestTime' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'DurationSeconds' => Array ('type' => 'int', 'default' => 0), 'AnswerStatus' => Array ('type' => 'string', 'default' => ''), 'ListingId' => Array ('type' => 'int', 'default' => 0), ~~- 'Errors' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ ~~- 'Request' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ ~~- 'Answer' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'Errors' => Array ('type' => 'string', 'default' => NULL), + 'Request' => Array ('type' => 'string', 'default' => NULL), + 'Answer' => Array ('type' => 'string', 'default' => NULL), 'AnswerFile' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), ), Index: in-auction/units/listing/listing_config.php =================================================================== --- in-auction/units/listing/listing_config.php (revision 12677) +++ in-auction/units/listing/listing_config.php (working copy) @@ -179,8 +179,8 @@ 'ImageUrls' => Array('type' => 'string', 'default' => null), 'UseGallery' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 0), 'UseGalleryPlus' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 0), ~~- 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#',),~~ ~~- 'Archived' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => 0,),~~ + 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'Archived' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'PaymentMethod' => Array( 'type' => 'string', 'formatter'=>'kOptionsFormatter', @@ -196,7 +196,7 @@ 'AutoRelist' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 0), 'PaymentInstructions' => Array('type' => 'string', 'default' => null), 'OriginalListingId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#',),~~ + 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'ListingQuantity' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'QuantityPaid' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'QuantitySold' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), @@ -236,10 +236,11 @@ 'Fixed' => Array('type' => 'int', 'default' => null), 'LogId' => Array('type' => 'int', 'default' => null), 'ShippingDetails' => Array ('type' => 'string', 'default' => NULL), ~~- 'ClosedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null,),~~ + 'ClosedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), 'ListingFee' => Array('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => null), 'Winner' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Hits' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), + 'RequestParams' => Array ('type' => 'string', 'default' => NULL), ), 'VirtualFields' => Array( Index: in-auction/units/product_listing/product_listing_config.php =================================================================== --- in-auction/units/product_listing/product_listing_config.php (revision 12677) +++ in-auction/units/product_listing/product_listing_config.php (working copy) @@ -241,7 +241,7 @@ 'AutoRelist' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => null), 'PaymentInstructions' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), ~~- 'Images' => Array('type' => 'string', 'not_null'=>1, 'default' => ''),~~ + 'Images' => Array('type' => 'string', 'default' => NULL), 'ListingTitle' => Array('type' => 'string','default' => null), 'ListingDescription' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), 'AuctionStartPrice' => Array('type'=>'float', 'min_value_inc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => null), Index: in-auction/units/schedule/schedule_config.php =================================================================== --- in-auction/units/schedule/schedule_config.php (revision 12677) +++ in-auction/units/schedule/schedule_config.php (working copy) @@ -99,9 +99,9 @@ 6 => 'la_Saturday', 7 => 'la_Sunday', ), 'use_phrases' => true), ~~- 'StartDate' => Array ('type' => 'int', 'not_null' => 1, 'default' => '#NOW#', 'formatter' => 'kDateFormatter', 'format' => 'm/d/y'),~~ ~~- 'StartTime' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'formatter' => 'kDateFormatter', 'input_date_format' => '', 'date_format' => ''),~~ ~~- 'EndTime' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'formatter' => 'kDateFormatter', 'input_date_format' => '', 'date_format' => ''),~~ + 'StartDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'format' => 'm/d/y', 'default' => '#NOW#'), + 'StartTime' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'input_date_format' => '', 'date_format' => '', 'default' => NULL), + 'EndTime' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'input_date_format' => '', 'date_format' => '', 'default' => NULL), 'ListingType' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1, 'required'=>true, 'formatter'=>'kOptionsFormatter', 'options'=>Array( EBAY_LISTING_TYPE_AUCTION => 'la_Auction', EBAY_LISTING_TYPE_STORE => 'la_Store', @@ -109,7 +109,7 @@ 'use_phrases'=>1, ), 'ContinueUntilQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'LastProcessed' => Array ('type' => 'int', 'default' => '', 'formatter' => 'kDateFormatter'),~~ + 'LastProcessed' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'Status' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'formatter'=>'kOptionsFormatter', 'options' => Array( 1 => 'la_Enabled', 0 => 'la_Disabled', Index: in-bulletin/install/install_schema.sql =================================================================== --- in-bulletin/install/install_schema.sql (revision 12677) +++ in-bulletin/install/install_schema.sql (working copy) @@ -1,20 +1,20 @@ CREATE TABLE Posting ( ~~- PostingId int(11) NOT NULL auto_increment,~~ ~~- IPAddress varchar(255) NOT NULL default '',~~ ~~- PosterAlias varchar(255) NOT NULL default '',~~ ~~- Pending tinyint(4) NOT NULL default '0',~~ ~~- Subject varchar(255) default NULL,~~ + PostingId int(11) NOT NULL AUTO_INCREMENT, + IPAddress varchar(255) NOT NULL DEFAULT '', + PosterAlias varchar(255) NOT NULL DEFAULT '', + Pending tinyint(4) NOT NULL DEFAULT '0', + `Subject` varchar(255) DEFAULT NULL, PostingText text, ~~- GraphicsUrl varchar(255) default NULL,~~ ~~- CreatedOn int(11) NOT NULL default '0',~~ ~~- Modified int(11) NOT NULL default '0',~~ ~~- ModifiedById int(11) default NULL,~~ ~~- CreatedById int(11) default NULL,~~ ~~- TopicId int(11) NOT NULL default '0',~~ ~~- ResourceId int(11) NOT NULL default '0',~~ ~~- ReplyTo int(11) NOT NULL default '0',~~ ~~- Options int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (PostingId),~~ + GraphicsUrl varchar(255) DEFAULT NULL, + CreatedOn int(11) DEFAULT NULL, + Modified int(11) DEFAULT NULL, + ModifiedById int(11) DEFAULT NULL, + CreatedById int(11) DEFAULT NULL, + TopicId int(11) NOT NULL DEFAULT '0', + ResourceId int(11) NOT NULL DEFAULT '0', + ReplyTo int(11) NOT NULL DEFAULT '0', + `Options` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (PostingId), KEY TopicId (TopicId), KEY Pending (Pending), KEY CreatedById (CreatedById), @@ -24,44 +24,44 @@ ); CREATE TABLE Topic ( ~~- TopicId int(11) NOT NULL auto_increment,~~ ~~- NotifyOwnerOnChanges tinyint(4) NOT NULL default '0',~~ ~~- Modified int(11) NOT NULL default '0',~~ ~~- TopicText varchar(255) NOT NULL default '',~~ ~~- AutomaticFilename tinyint(3) unsigned NOT NULL default '1',~~ ~~- Posts int(11) NOT NULL default '0',~~ ~~- Views double(20,6) NOT NULL default '0',~~ ~~- EditorsPick tinyint(4) NOT NULL default '0',~~ ~~- Status tinyint(4) unsigned NOT NULL default '2',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- OwnerId int(11) NOT NULL default '-1',~~ ~~- ModifiedById int(11) NOT NULL default '0',~~ ~~- ResourceId int(11) default NULL,~~ ~~- TopicType int(11) NOT NULL default '1',~~ ~~- CreatedOn int(11) NOT NULL default '0',~~ ~~- CachedReviewsQty int(11) NOT NULL default '0',~~ ~~- CachedRating VARCHAR(10) NOT NULL DEFAULT '0',~~ ~~- CachedVotesQty int(11) NOT NULL default '0',~~ ~~- NewItem tinyint(4) NOT NULL default '2',~~ ~~- PopItem tinyint(4) NOT NULL default '2',~~ ~~- HotItem tinyint(4) NOT NULL default '2',~~ ~~- PostedBy varchar(255) NOT NULL default '',~~ ~~- OrgId INT(11) NULL DEFAULT NULL,~~ ~~- LastPostId int(11) NOT NULL default '0',~~ ~~- LastPostDate INT(11) NULL DEFAULT NULL,~~ ~~- TodayDate DATE NULL DEFAULT NULL,~~ ~~- TodayPosts int(11) NOT NULL default '0',~~ + TopicId int(11) NOT NULL AUTO_INCREMENT, + NotifyOwnerOnChanges tinyint(4) NOT NULL DEFAULT '0', + Modified int(11) DEFAULT NULL, + TopicText varchar(255) NOT NULL DEFAULT '', + AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1', + Posts int(11) NOT NULL DEFAULT '0', + Views double(20,6) NOT NULL DEFAULT '0.000000', + EditorsPick tinyint(4) NOT NULL DEFAULT '0', + `Status` tinyint(4) unsigned NOT NULL DEFAULT '2', + Priority int(11) NOT NULL DEFAULT '0', + OwnerId int(11) NOT NULL DEFAULT '-1', + ModifiedById int(11) NOT NULL DEFAULT '0', + ResourceId int(11) DEFAULT NULL, + TopicType int(11) NOT NULL DEFAULT '1', + CreatedOn int(11) DEFAULT NULL, + CachedReviewsQty int(11) NOT NULL DEFAULT '0', + CachedRating varchar(10) NOT NULL DEFAULT '0', + CachedVotesQty int(11) NOT NULL DEFAULT '0', + NewItem tinyint(4) NOT NULL DEFAULT '2', + PopItem tinyint(4) NOT NULL DEFAULT '2', + HotItem tinyint(4) NOT NULL DEFAULT '2', + PostedBy varchar(255) NOT NULL DEFAULT '', + OrgId int(11) DEFAULT NULL, + LastPostId int(11) NOT NULL DEFAULT '0', + LastPostDate int(11) DEFAULT NULL, + TodayDate date DEFAULT NULL, + TodayPosts int(11) NOT NULL DEFAULT '0', MetaKeywords varchar(255) DEFAULT NULL, ~~- MetaDescription text NULL DEFAULT NULL,~~ ~~- PRIMARY KEY (TopicId),~~ + MetaDescription text, + PRIMARY KEY (TopicId), + UNIQUE KEY ResourceId (ResourceId), KEY OwnerId (OwnerId), ~~- UNIQUE KEY ResourceId (ResourceId),~~ KEY ModifiedById (ModifiedById), KEY Posts (Posts), KEY Modified (Modified), KEY Views (Views), KEY EditorsPick (EditorsPick), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY Priority (Priority), KEY CreatedOn (CreatedOn), KEY NewItem (NewItem), @@ -78,35 +78,35 @@ ); CREATE TABLE Emoticon ( ~~- EmoticonId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(20) NOT NULL default '',~~ ~~- KeyStroke varchar(20) NOT NULL default '',~~ ~~- Enabled int(11) NOT NULL default '1',~~ ~~- EmotionImage VARCHAR(255) NOT NULL,~~ ~~- PRIMARY KEY (EmoticonId),~~ + EmoticonId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(20) NOT NULL DEFAULT '', + KeyStroke varchar(20) NOT NULL DEFAULT '', + Enabled int(11) NOT NULL DEFAULT '1', + EmotionImage varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (EmoticonId), KEY Enabled (Enabled), KEY EmotionImage (EmotionImage) ); CREATE TABLE PrivateMessageBody ( ~~- PMBodyId int(11) unsigned NOT NULL auto_increment,~~ ~~- Subject varchar(255) NOT NULL default '',~~ ~~- Body text NOT NULL,~~ ~~- Options tinyint(3) unsigned NOT NULL default '0',~~ ~~- ReferenceCount smallint(5) unsigned NOT NULL default '2',~~ ~~- PRIMARY KEY (PMBodyId),~~ + PMBodyId int(11) unsigned NOT NULL AUTO_INCREMENT, + `Subject` varchar(255) NOT NULL DEFAULT '', + Body text, + `Options` tinyint(3) unsigned NOT NULL DEFAULT '0', + ReferenceCount smallint(5) unsigned NOT NULL DEFAULT '2', + PRIMARY KEY (PMBodyId), KEY ReferenceCount (ReferenceCount) ); CREATE TABLE PrivateMessages ( ~~- PmId int(11) unsigned NOT NULL auto_increment,~~ ~~- FromId int(11) unsigned default NULL,~~ ~~- ToId int(11) unsigned default NULL,~~ ~~- FolderId tinyint(3) NOT NULL default '-1',~~ ~~- `Status` tinyint(1) unsigned NOT NULL default '0',~~ ~~- PMBodyId int(11) unsigned NOT NULL default '0',~~ ~~- CreatedOn int(11) unsigned NOT NULL default '0',~~ ~~- PRIMARY KEY (PmId),~~ + PmId int(11) unsigned NOT NULL AUTO_INCREMENT, + FromId int(11) unsigned DEFAULT NULL, + ToId int(11) unsigned DEFAULT NULL, + FolderId tinyint(3) NOT NULL DEFAULT '-1', + `Status` tinyint(1) unsigned NOT NULL DEFAULT '0', + PMBodyId int(11) unsigned NOT NULL DEFAULT '0', + CreatedOn int(11) unsigned DEFAULT NULL, + PRIMARY KEY (PmId), KEY FromId (FromId), KEY CreatedOn (CreatedOn), KEY ToId (ToId), @@ -121,24 +121,24 @@ ); CREATE TABLE Polls ( ~~- PollId int(11) NOT NULL auto_increment,~~ ~~- `Name` varchar(255) NOT NULL default '',~~ + PollId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', l1_Question text, l2_Question text, l3_Question text, l4_Question text, l5_Question text, ~~- Image varchar(255) NOT NULL default '',~~ ~~- CreatedOn int(11) unsigned NOT NULL,~~ ~~- StartDate int(11) unsigned NOT NULL,~~ ~~- EndDate int(11) unsigned default NULL,~~ ~~- Priority tinyint(4) NOT NULL default '0',~~ ~~- RequireLogin tinyint(4) NOT NULL default '0',~~ ~~- AllowMultipleVotings tinyint(4) NOT NULL default '1',~~ ~~- AllowComments tinyint(4) NOT NULL default '1',~~ ~~- `Status` tinyint(4) NOT NULL default '1',~~ ~~- CachedVotesQty int(11) NOT NULL,~~ ~~- PRIMARY KEY (PollId),~~ + Image varchar(255) NOT NULL DEFAULT '', + CreatedOn int(11) unsigned DEFAULT NULL, + StartDate int(11) unsigned DEFAULT NULL, + EndDate int(11) unsigned DEFAULT NULL, + Priority tinyint(4) NOT NULL DEFAULT '0', + RequireLogin tinyint(4) NOT NULL DEFAULT '0', + AllowMultipleVotings tinyint(4) NOT NULL DEFAULT '1', + AllowComments tinyint(4) NOT NULL DEFAULT '1', + `Status` tinyint(4) NOT NULL DEFAULT '1', + CachedVotesQty int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (PollId), KEY `Status` (`Status`), KEY Priority (Priority), KEY StartDate (StartDate), @@ -146,36 +146,36 @@ ); CREATE TABLE PollsAnswers ( ~~- AnswerId int(11) NOT NULL auto_increment,~~ ~~- PollId int(11) NOT NULL,~~ + AnswerId int(11) NOT NULL AUTO_INCREMENT, + PollId int(11) NOT NULL DEFAULT '0', l1_Answer text, l2_Answer text, l3_Answer text, l4_Answer text, l5_Answer text, ~~- VotesQty int(11) NOT NULL,~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- Status tinyint(4) NOT NULL default '1',~~ ~~- PRIMARY KEY (AnswerId),~~ ~~- KEY Status (Status),~~ + VotesQty int(11) NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + PRIMARY KEY (AnswerId), + KEY `Status` (`Status`), KEY Priority (Priority), KEY VoteCount (VotesQty), KEY PollId (PollId) ); CREATE TABLE PollsComments ( ~~- CommentId int(11) NOT NULL auto_increment,~~ ~~- PollId int(11) NOT NULL,~~ ~~- AnswerId int(11) default NULL,~~ ~~- CreatedById int(11) NOT NULL default '-2',~~ ~~- GuestName varchar(255) NOT NULL,~~ ~~- GuestEmail varchar(255) NOT NULL,~~ + CommentId int(11) NOT NULL AUTO_INCREMENT, + PollId int(11) NOT NULL DEFAULT '0', + AnswerId int(11) DEFAULT NULL, + CreatedById int(11) NOT NULL DEFAULT '-2', + GuestName varchar(255) NOT NULL DEFAULT '', + GuestEmail varchar(255) NOT NULL DEFAULT '', CommentBody text, ~~- CreatedOn int(11) NOT NULL,~~ ~~- UserIP varchar(255) NOT NULL,~~ ~~- Priority int(11) NOT NULL,~~ ~~- `Status` tinyint(4) NOT NULL default '1',~~ ~~- PRIMARY KEY (CommentId),~~ + CreatedOn int(11) DEFAULT NULL, + UserIP varchar(255) NOT NULL DEFAULT '', + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + PRIMARY KEY (CommentId), KEY `Status` (`Status`), KEY Priority (Priority), KEY CreatedOn (CreatedOn), @@ -185,13 +185,13 @@ ); CREATE TABLE PollsStatistics ( ~~- StatisticsId int(11) NOT NULL auto_increment,~~ ~~- PollId int(11) NOT NULL default '0',~~ ~~- AnswerId int(11) NOT NULL default '0',~~ ~~- CreatedById int(11) NOT NULL default '-2',~~ ~~- UserIP varchar(255) NOT NULL,~~ ~~- AnswerDate int(10) unsigned default NULL,~~ ~~- PRIMARY KEY (StatisticsId),~~ + StatisticsId int(11) NOT NULL AUTO_INCREMENT, + PollId int(11) NOT NULL DEFAULT '0', + AnswerId int(11) NOT NULL DEFAULT '0', + CreatedById int(11) NOT NULL DEFAULT '-2', + UserIP varchar(255) NOT NULL DEFAULT '', + AnswerDate int(10) unsigned DEFAULT NULL, + PRIMARY KEY (StatisticsId), KEY AnswerId (AnswerId,PollId), KEY CreatedById (CreatedById), KEY UserIP (UserIP) Index: in-bulletin/install/upgrades.sql =================================================================== --- in-bulletin/install/upgrades.sql (revision 12677) +++ in-bulletin/install/upgrades.sql (working copy) @@ -127,4 +127,38 @@ INSERT INTO Events VALUES(DEFAULT, 'TOPIC.MODIFY.PENDING', NULL, 1, 1, NULL, 'In-Bulletin', 'la_event_topic.modify.pending', 0); INSERT INTO Events VALUES(DEFAULT, 'TOPIC.APPROVE', NULL, 1, 0, NULL, 'In-Bulletin', 'la_event_topic.approve', 0); ~~-UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('topic_ReviewDelay_Value', 'topic_RatingDelay_Value', 'poll_CommentDelay_Value');~~ \ No newline at end of file +UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('topic_ReviewDelay_Value', 'topic_RatingDelay_Value', 'poll_CommentDelay_Value'); + +# ===== v 5.0.2 ===== +ALTER TABLE PrivateMessageBody CHANGE Body Body text NULL; + +ALTER TABLE Emoticon CHANGE EmotionImage EmotionImage VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE Polls + CHANGE CreatedOn CreatedOn INT(11) UNSIGNED NULL DEFAULT NULL , + CHANGE StartDate StartDate INT(11) UNSIGNED NULL DEFAULT NULL , + CHANGE CachedVotesQty CachedVotesQty INT(11) NOT NULL DEFAULT '0'; + +ALTER TABLE PollsAnswers + CHANGE PollId PollId INT(11) NOT NULL DEFAULT '0', + CHANGE VotesQty VotesQty INT(11) NOT NULL DEFAULT '0'; + +ALTER TABLE PollsComments + CHANGE PollId PollId INT(11) NOT NULL DEFAULT '0', + CHANGE GuestName GuestName VARCHAR(255) NOT NULL DEFAULT '', + CHANGE GuestEmail GuestEmail VARCHAR(255) NOT NULL DEFAULT '', + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL , + CHANGE UserIP UserIP VARCHAR(255) NOT NULL DEFAULT '', + CHANGE Priority Priority INT(11) NOT NULL DEFAULT '0'; + +ALTER TABLE PollsStatistics CHANGE UserIP UserIP VARCHAR(255) NOT NULL DEFAULT ''; + +ALTER TABLE Posting + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL, + CHANGE Modified Modified INT(11) NULL DEFAULT NULL; + +ALTER TABLE PrivateMessages CHANGE CreatedOn CreatedOn INT(11) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE Topic + CHANGE Modified Modified INT(11) NULL DEFAULT NULL, + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-bulletin/units/poll_comments/poll_comments_config.php =================================================================== --- in-bulletin/units/poll_comments/poll_comments_config.php (revision 12677) +++ in-bulletin/units/poll_comments/poll_comments_config.php (working copy) @@ -67,7 +67,7 @@ 'GuestName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'GuestEmail' => Array('type' => 'string', 'max_len' => 255, 'formatter'=>'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'not_null' => '1', 'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!'),'required' => 0 ), 'CommentBody' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL, 'required' => 1), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1, 'default' => '#NOW#'),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'UserIP' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Active', 0 => 'la_opt_Disabled', 2 => 'la_opt_Pending'), 'use_phrases' => 1, 'required' => 1, 'not_null' => 1, 'default' => 1), Index: in-bulletin/units/polls/polls_config.php =================================================================== --- in-bulletin/units/polls/polls_config.php (revision 12677) +++ in-bulletin/units/polls/polls_config.php (working copy) @@ -103,8 +103,8 @@ 'PollId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'Name' => Array('type' => 'string', 'not_null' => '1','default' => '', 'required'=> 1, 'max_len' => 255), 'Question' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => null, 'required' => 1), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1, 'default' => '#NOW#'),~~ ~~- 'StartDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1, 'default' => '#NOW#'),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), + 'StartDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'EndDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), 'Image' => Array ( 'type' => 'string', Index: in-bulletin/units/posts/posts_config.php =================================================================== --- in-bulletin/units/posts/posts_config.php (revision 12677) +++ in-bulletin/units/posts/posts_config.php (working copy) @@ -83,8 +83,8 @@ 'Subject' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), 'PostingText' => Array ('type' => 'string', 'allow_html' => 1, 'default' => NULL), 'GraphicsUrl' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ ~~- 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL), 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL), 'TopicId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), Index: in-bulletin/units/private_message_body/private_message_body_config.php =================================================================== --- in-bulletin/units/private_message_body/private_message_body_config.php (revision 12677) +++ in-bulletin/units/private_message_body/private_message_body_config.php (working copy) @@ -46,7 +46,7 @@ 'Fields' => Array ( 'PMBodyId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), ~~- 'Body' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'Body' => Array ('type' => 'string', 'default' => NULL), 'Options' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'ReferenceCount' => Array ('type' => 'int', 'not_null' => 1, 'default' => 2), ), Index: in-bulletin/units/private_messages/private_messages_config.php =================================================================== --- in-bulletin/units/private_messages/private_messages_config.php (revision 12677) +++ in-bulletin/units/private_messages/private_messages_config.php (working copy) @@ -90,7 +90,7 @@ 'FolderId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_Inbox', 1 => 'lu_Sent'), 'use_phrases' => 1, 'not_null' => 1, 'default' => PM_FOLDER_SENT), 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_opt_MessageUnread', 1 => 'lu_opt_MessageViewed', 2 => 'lu_opt_MessageRead', 3 => 'lu_opt_MessageReplied', 4 => 'lu_opt_MessageSent'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'PMBodyId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => '#NOW#'),~~ + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), ), 'VirtualFields' => Array ( Index: in-bulletin/units/topics/topics_config.php =================================================================== --- in-bulletin/units/topics/topics_config.php (revision 12677) +++ in-bulletin/units/topics/topics_config.php (working copy) @@ -298,7 +298,7 @@ 'Fields' => Array ( 'TopicId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'NotifyOwnerOnChanges' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_No', 1 => 'lu_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), ~~- 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1, 'default' => '#NOW#'),~~ + 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'TopicText' => Array('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''), 'AutomaticFilename' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), 'Posts' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), @@ -310,7 +310,7 @@ 'ModifiedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'default' => 0), 'ResourceId' => Array('type' => 'int', 'default' => null), 'TopicType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Yes', 1 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), ~~- 'CreatedOn' => Array('type' => 'double', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#', 'not_null' => 1),~~ + 'CreatedOn' => Array('type' => 'double', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'CachedReviewsQty' => Array('type' => 'int' ,'not_null' => 1, 'default' => 0), 'CachedRating' => Array('type' => 'string', 'not_null' => 1, 'default' => 0), 'CachedVotesQty' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), Index: in-commerce/install/install_schema.sql =================================================================== --- in-commerce/install/install_schema.sql (revision 12677) +++ in-commerce/install/install_schema.sql (working copy) @@ -23,30 +23,30 @@ ); CREATE TABLE Currencies ( ~~- CurrencyId int(11) NOT NULL auto_increment,~~ ~~- ISO char(3) NOT NULL default '',~~ ~~- Symbol varchar(255) default NULL,~~ ~~- SymbolPosition tinyint(4) default NULL,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- RateToPrimary double NOT NULL default '1',~~ ~~- Modified int(11) NOT NULL default '0',~~ ~~- Status smallint(6) NOT NULL default '0',~~ ~~- IsPrimary smallint(6) NOT NULL default '0',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (CurrencyId),~~ + CurrencyId int(11) NOT NULL AUTO_INCREMENT, + ISO char(3) NOT NULL DEFAULT '', + Symbol varchar(255) DEFAULT NULL, + SymbolPosition tinyint(4) DEFAULT NULL, + `Name` varchar(255) NOT NULL DEFAULT '', + RateToPrimary double NOT NULL DEFAULT '1', + Modified int(11) DEFAULT NULL, + `Status` smallint(6) NOT NULL DEFAULT '1', + IsPrimary smallint(6) NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (CurrencyId), KEY Priority (Priority), KEY IsPrimary (IsPrimary), KEY Modified (Modified) ); CREATE TABLE GatewayConfigFields ( ~~- GWConfigFieldId int(11) NOT NULL auto_increment,~~ ~~- SystemFieldName varchar(50) NOT NULL default '',~~ ~~- FieldName varchar(100) NOT NULL default '',~~ ~~- ElementType varchar(30) NOT NULL default 'text',~~ ~~- ValueList mediumtext NOT NULL,~~ ~~- GatewayId int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (GWConfigFieldId),~~ + GWConfigFieldId int(11) NOT NULL AUTO_INCREMENT, + SystemFieldName varchar(50) NOT NULL DEFAULT '', + FieldName varchar(100) NOT NULL DEFAULT '', + ElementType varchar(30) NOT NULL DEFAULT 'text', + ValueList mediumtext, + GatewayId int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (GWConfigFieldId), KEY GatewayId (GatewayId) ); @@ -70,22 +70,22 @@ ); CREATE TABLE Manufacturers ( ~~- ManufacturerId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- Description text NOT NULL,~~ ~~- URL varchar(255) NOT NULL default '',~~ ~~- Logo varchar(255) NOT NULL default '',~~ ~~- IsPopular int(10) unsigned NOT NULL default '0',~~ ~~- Address1 varchar(255) default NULL,~~ ~~- Address2 varchar(255) default NULL,~~ ~~- City varchar(255) default NULL,~~ ~~- State varchar(50) default NULL,~~ ~~- Zip varchar(50) default NULL,~~ ~~- Country varchar(255) default NULL,~~ ~~- Phone varchar(50) default NULL,~~ ~~- Fax varchar(50) default NULL,~~ ~~- Email varchar(255) default NULL,~~ ~~- PRIMARY KEY (ManufacturerId)~~ + ManufacturerId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + Description text, + URL varchar(255) NOT NULL DEFAULT '', + Logo varchar(255) NOT NULL DEFAULT '', + IsPopular int(10) unsigned NOT NULL DEFAULT '0', + Address1 varchar(255) DEFAULT NULL, + Address2 varchar(255) DEFAULT NULL, + City varchar(255) DEFAULT NULL, + State varchar(50) DEFAULT NULL, + Zip varchar(50) DEFAULT NULL, + Country varchar(255) DEFAULT NULL, + Phone varchar(50) DEFAULT NULL, + Fax varchar(50) DEFAULT NULL, + Email varchar(255) DEFAULT NULL, + PRIMARY KEY (ManufacturerId) ); CREATE TABLE OrderItems ( @@ -122,79 +122,79 @@ ); CREATE TABLE Orders ( ~~- OrderId int(11) NOT NULL auto_increment,~~ ~~- Number mediumint(9) NOT NULL default '0',~~ ~~- SubNumber smallint(6) NOT NULL default '0',~~ ~~- `Status` tinyint(3) unsigned NOT NULL default '0',~~ ~~- OnHold tinyint(3) unsigned NOT NULL default '0',~~ ~~- OrderDate int(10) unsigned NOT NULL default '0',~~ ~~- PortalUserId int(11) NOT NULL default '-1',~~ ~~- OrderIP varchar(30) NOT NULL default '',~~ ~~- UserComment text NOT NULL,~~ ~~- AdminComment text NOT NULL,~~ ~~- BillingTo varchar(255) NOT NULL default '',~~ ~~- BillingCompany varchar(255) NOT NULL default '',~~ ~~- BillingPhone varchar(255) NOT NULL default '',~~ ~~- BillingFax varchar(255) NOT NULL default '',~~ ~~- BillingEmail varchar(255) NOT NULL default '',~~ ~~- BillingAddress1 varchar(255) NOT NULL default '',~~ ~~- BillingAddress2 varchar(255) NOT NULL default '',~~ ~~- BillingCity varchar(255) NOT NULL default '',~~ ~~- BillingState varchar(255) NOT NULL default '',~~ ~~- BillingZip varchar(255) NOT NULL default '',~~ ~~- BillingCountry varchar(255) NOT NULL default 'USA',~~ ~~- VAT decimal(20,4) NOT NULL default '0.0000',~~ ~~- VATPercent decimal(20,4) NOT NULL default '0.0000',~~ ~~- PaymentType tinyint(3) unsigned NOT NULL default '0',~~ ~~- PaymentAccount varchar(255) NOT NULL default '',~~ ~~- PaymentExpires int(10) unsigned NOT NULL default '0',~~ ~~- PaymentNameOnCard varchar(255) NOT NULL default '',~~ ~~- PaymentCCExpDate varchar(5) NOT NULL default '',~~ ~~- PaymentCardType varchar(255) NOT NULL default '',~~ ~~- ShippingTo varchar(255) NOT NULL default '',~~ ~~- ShippingCompany varchar(255) NOT NULL default '',~~ ~~- ShippingPhone varchar(255) NOT NULL default '',~~ ~~- ShippingFax varchar(255) NOT NULL default '',~~ ~~- ShippingEmail varchar(255) NOT NULL default '',~~ ~~- ShippingAddress1 varchar(255) NOT NULL default '',~~ ~~- ShippingAddress2 varchar(255) NOT NULL default '',~~ ~~- ShippingCity varchar(255) NOT NULL default '',~~ ~~- ShippingState varchar(255) NOT NULL default '',~~ ~~- ShippingZip varchar(255) NOT NULL default '',~~ ~~- ShippingCountry varchar(255) NOT NULL default 'USA',~~ ~~- ShippingType int(11) NOT NULL default '0',~~ ~~- ShippingCost decimal(20,4) NOT NULL default '0.0000',~~ ~~- ShippingCustomerAccount varchar(255) NOT NULL default '',~~ ~~- ShippingTracking varchar(255) NOT NULL default '',~~ ~~- ShippingDate int(11) default NULL,~~ ~~- SubTotal decimal(20,4) unsigned NOT NULL default '0.0000',~~ ~~- ReturnTotal decimal(20,4) NOT NULL default '0.0000',~~ ~~- CostTotal decimal(20,4) NOT NULL default '0.0000',~~ ~~- OriginalAmount decimal(20,4) NOT NULL default '0.0000',~~ ~~- ShippingOption tinyint(4) default NULL,~~ + OrderId int(11) NOT NULL AUTO_INCREMENT, + Number mediumint(9) NOT NULL DEFAULT '0', + SubNumber smallint(6) NOT NULL DEFAULT '0', + `Status` tinyint(3) unsigned NOT NULL DEFAULT '0', + OnHold tinyint(3) unsigned NOT NULL DEFAULT '0', + OrderDate int(10) unsigned DEFAULT NULL, + PortalUserId int(11) NOT NULL DEFAULT '-1', + OrderIP varchar(30) NOT NULL DEFAULT '', + UserComment text, + AdminComment text, + BillingTo varchar(255) NOT NULL DEFAULT '', + BillingCompany varchar(255) NOT NULL DEFAULT '', + BillingPhone varchar(255) NOT NULL DEFAULT '', + BillingFax varchar(255) NOT NULL DEFAULT '', + BillingEmail varchar(255) NOT NULL DEFAULT '', + BillingAddress1 varchar(255) NOT NULL DEFAULT '', + BillingAddress2 varchar(255) NOT NULL DEFAULT '', + BillingCity varchar(255) NOT NULL DEFAULT '', + BillingState varchar(255) NOT NULL DEFAULT '', + BillingZip varchar(255) NOT NULL DEFAULT '', + BillingCountry varchar(255) NOT NULL DEFAULT 'USA', + VAT decimal(20,4) NOT NULL DEFAULT '0.0000', + VATPercent decimal(20,4) NOT NULL DEFAULT '0.0000', + PaymentType tinyint(3) unsigned NOT NULL DEFAULT '0', + PaymentAccount varchar(255) NOT NULL DEFAULT '', + PaymentExpires int(10) unsigned DEFAULT NULL, + PaymentNameOnCard varchar(255) NOT NULL DEFAULT '', + PaymentCCExpDate varchar(5) NOT NULL DEFAULT '', + PaymentCardType varchar(255) NOT NULL DEFAULT '', + ShippingTo varchar(255) NOT NULL DEFAULT '', + ShippingCompany varchar(255) NOT NULL DEFAULT '', + ShippingPhone varchar(255) NOT NULL DEFAULT '', + ShippingFax varchar(255) NOT NULL DEFAULT '', + ShippingEmail varchar(255) NOT NULL DEFAULT '', + ShippingAddress1 varchar(255) NOT NULL DEFAULT '', + ShippingAddress2 varchar(255) NOT NULL DEFAULT '', + ShippingCity varchar(255) NOT NULL DEFAULT '', + ShippingState varchar(255) NOT NULL DEFAULT '', + ShippingZip varchar(255) NOT NULL DEFAULT '', + ShippingCountry varchar(255) NOT NULL DEFAULT 'USA', + ShippingType int(11) NOT NULL DEFAULT '0', + ShippingCost decimal(20,4) NOT NULL DEFAULT '0.0000', + ShippingCustomerAccount varchar(255) NOT NULL DEFAULT '', + ShippingTracking varchar(255) NOT NULL DEFAULT '', + ShippingDate int(11) DEFAULT NULL, + SubTotal decimal(20,4) unsigned NOT NULL DEFAULT '0.0000', + ReturnTotal decimal(20,4) NOT NULL DEFAULT '0.0000', + CostTotal decimal(20,4) NOT NULL DEFAULT '0.0000', + OriginalAmount decimal(20,4) NOT NULL DEFAULT '0.0000', + ShippingOption tinyint(4) DEFAULT NULL, ShippingInfo text, ~~- CouponId int(11) default NULL,~~ ~~- CouponDiscount decimal(20,4) NOT NULL default '0.0000',~~ ~~- DiscountTotal decimal(10,4) NOT NULL default '0.0000',~~ ~~- TransactionStatus tinyint(3) unsigned NOT NULL default '2',~~ ~~- GWResult1 mediumtext NOT NULL,~~ ~~- GWResult2 mediumtext NOT NULL,~~ ~~- AffiliateId int(10) unsigned NOT NULL default '0',~~ ~~- VisitId int(10) unsigned NOT NULL default '0',~~ ~~- AffiliateCommission decimal(10,4) NOT NULL default '0.0000',~~ ~~- ProcessingFee decimal(20,4) default '0.0000',~~ ~~- InsuranceFee decimal(20,4) NOT NULL default '0.0000',~~ ~~- ShippingTaxable tinyint(1) NOT NULL default '0',~~ ~~- ProcessingTaxable tinyint(1) NOT NULL default '0',~~ ~~- IsRecurringBilling tinyint(4) NOT NULL default '0',~~ ~~- NextCharge int(10) unsigned default NULL,~~ ~~- GroupId int(10) unsigned NOT NULL default '0',~~ ~~- ChargeOnNextApprove tinyint(4) NOT NULL default '0',~~ ~~- ShippingGroupOption tinyint(4) NOT NULL default '0',~~ ~~- GiftCertificateId int(11) default NULL,~~ ~~- GiftCertificateDiscount decimal(20,4) NOT NULL default '0.0000',~~ ~~- GoogleOrderNumber bigint(20) unsigned default NULL,~~ ~~- PRIMARY KEY (OrderId),~~ + CouponId int(11) DEFAULT NULL, + CouponDiscount decimal(20,4) NOT NULL DEFAULT '0.0000', + DiscountTotal decimal(10,4) NOT NULL DEFAULT '0.0000', + TransactionStatus tinyint(3) unsigned NOT NULL DEFAULT '2', + GWResult1 mediumtext, + GWResult2 mediumtext, + AffiliateId int(10) unsigned NOT NULL DEFAULT '0', + VisitId int(10) unsigned NOT NULL DEFAULT '0', + AffiliateCommission decimal(10,4) NOT NULL DEFAULT '0.0000', + ProcessingFee decimal(20,4) DEFAULT '0.0000', + InsuranceFee decimal(20,4) NOT NULL DEFAULT '0.0000', + ShippingTaxable tinyint(1) NOT NULL DEFAULT '0', + ProcessingTaxable tinyint(1) NOT NULL DEFAULT '0', + IsRecurringBilling tinyint(4) NOT NULL DEFAULT '0', + NextCharge int(10) unsigned DEFAULT NULL, + GroupId int(10) unsigned NOT NULL DEFAULT '0', + ChargeOnNextApprove tinyint(4) NOT NULL DEFAULT '0', + ShippingGroupOption tinyint(4) NOT NULL DEFAULT '0', + GiftCertificateId int(11) DEFAULT NULL, + GiftCertificateDiscount decimal(20,4) NOT NULL DEFAULT '0.0000', + GoogleOrderNumber bigint(20) unsigned DEFAULT NULL, + PRIMARY KEY (OrderId), KEY AffiliateId (AffiliateId), KEY VisitId (VisitId), KEY GoogleOrderNumber (GoogleOrderNumber), @@ -209,30 +209,30 @@ ); CREATE TABLE GiftCertificates ( ~~- GiftCertificateId int(11) NOT NULL auto_increment,~~ ~~- OrderId int(11) default '0',~~ ~~- Purchaser varchar(64) default NULL,~~ ~~- Recipient varchar(64) default NULL,~~ ~~- SendVia tinyint(1) NOT NULL default '0',~~ ~~- RecipientEmail varchar(64) NOT NULL default '',~~ ~~- RecipientFirstname varchar(128) default NULL,~~ ~~- RecipientLastname varchar(128) default NULL,~~ ~~- RecipientAddress1 varchar(255) default NULL,~~ ~~- RecipientAddress2 varchar(255) default NULL,~~ ~~- RecipientCity varchar(64) default NULL,~~ ~~- RecipientState varchar(32) default NULL,~~ ~~- RecipientZipcode varchar(32) default NULL,~~ ~~- RecipientCountry char(3) NOT NULL default 'USA',~~ ~~- RecipientPhone varchar(32) default NULL,~~ + GiftCertificateId int(11) NOT NULL AUTO_INCREMENT, + OrderId int(11) DEFAULT '0', + Purchaser varchar(64) DEFAULT NULL, + Recipient varchar(64) DEFAULT NULL, + SendVia tinyint(1) NOT NULL DEFAULT '0', + RecipientEmail varchar(64) NOT NULL DEFAULT '', + RecipientFirstname varchar(128) DEFAULT NULL, + RecipientLastname varchar(128) DEFAULT NULL, + RecipientAddress1 varchar(255) DEFAULT NULL, + RecipientAddress2 varchar(255) DEFAULT NULL, + RecipientCity varchar(64) DEFAULT NULL, + RecipientState varchar(32) DEFAULT NULL, + RecipientZipcode varchar(32) DEFAULT NULL, + RecipientCountry char(3) NOT NULL DEFAULT 'USA', + RecipientPhone varchar(32) DEFAULT NULL, Message text, ~~- Amount decimal(12,2) default '0.00',~~ ~~- Debit decimal(12,2) default '0.00',~~ ~~- `Status` tinyint(1) NOT NULL default '1',~~ ~~- AddDate int(11) default '0',~~ ~~- Expiration int(11) default NULL,~~ ~~- Code varchar(255) default NULL,~~ ~~- PRIMARY KEY (GiftCertificateId),~~ ~~- UNIQUE KEY Code (Code),~~ + Amount decimal(12,2) DEFAULT '0.00', + Debit decimal(12,2) DEFAULT '0.00', + `Status` tinyint(1) NOT NULL DEFAULT '2', + AddDate int(11) DEFAULT '0', + Expiration int(11) DEFAULT NULL, + `Code` varchar(255) DEFAULT NULL, + PRIMARY KEY (GiftCertificateId), + UNIQUE KEY `Code` (`Code`), KEY OrderId (OrderId), KEY `Status` (`Status`), KEY AddDate (AddDate) @@ -248,21 +248,21 @@ ); CREATE TABLE PaymentTypes ( ~~- PaymentTypeId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(100) NOT NULL default '',~~ ~~- Description varchar(255) default NULL,~~ + PaymentTypeId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(100) NOT NULL DEFAULT '', + Description varchar(255) DEFAULT NULL, Instructions text, AdminComments text, ~~- Status int(11) NOT NULL default '0',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- IsPrimary tinyint(4) NOT NULL default '0',~~ ~~- BuiltIn smallint(6) NOT NULL default '0',~~ ~~- GatewayId int(11) NOT NULL default '1',~~ ~~- PlacedOrdersEdit tinyint(4) NOT NULL default '0',~~ ~~- ProcessingFee DOUBLE NOT NULL DEFAULT '0',~~ ~~- PortalGroups TEXT NOT NULL,~~ ~~- PRIMARY KEY (PaymentTypeId),~~ ~~- KEY Status (Status),~~ + `Status` int(11) NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + IsPrimary tinyint(4) NOT NULL DEFAULT '0', + BuiltIn smallint(6) NOT NULL DEFAULT '0', + GatewayId int(11) NOT NULL DEFAULT '1', + PlacedOrdersEdit tinyint(4) NOT NULL DEFAULT '0', + ProcessingFee double NOT NULL DEFAULT '0', + PortalGroups text, + PRIMARY KEY (PaymentTypeId), + KEY `Status` (`Status`), KEY Priority (Priority), KEY GatewayId (GatewayId), KEY BuiltIn (BuiltIn), @@ -270,16 +270,16 @@ ); CREATE TABLE Products ( ~~- ProductId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) default '',~~ ~~- l1_Name varchar(255) default NULL,~~ ~~- l2_Name varchar(255) default NULL,~~ ~~- l3_Name varchar(255) default NULL,~~ ~~- l4_Name varchar(255) default NULL,~~ ~~- l5_Name varchar(255) default NULL,~~ ~~- AutomaticFilename tinyint(3) unsigned NOT NULL default '1',~~ ~~- SKU varchar(255) default NULL,~~ ~~- `Type` tinyint(2) unsigned NOT NULL default '1',~~ + ProductId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) DEFAULT '', + l1_Name varchar(255) DEFAULT NULL, + l2_Name varchar(255) DEFAULT NULL, + l3_Name varchar(255) DEFAULT NULL, + l4_Name varchar(255) DEFAULT NULL, + l5_Name varchar(255) DEFAULT NULL, + AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1', + SKU varchar(255) DEFAULT NULL, + `Type` tinyint(2) unsigned NOT NULL DEFAULT '1', Description text, l1_Description text, l2_Description text, @@ -292,57 +292,57 @@ l3_DescriptionExcerpt text, l4_DescriptionExcerpt text, l5_DescriptionExcerpt text, ~~- Weight double(10,4) default NULL,~~ ~~- ManufacturerId int(11) NOT NULL default '0',~~ ~~- MSRP double default NULL,~~ ~~- BackOrder tinyint(3) unsigned NOT NULL default '2',~~ ~~- BackOrderDate int(11) default NULL,~~ ~~- CreatedOn int(10) unsigned default NULL,~~ ~~- Modified int(10) unsigned default NULL,~~ ~~- Expire int(10) unsigned default NULL,~~ ~~- Hits double NOT NULL default '0',~~ ~~- CachedRating decimal(11,10) NOT NULL default '0.0000000000',~~ ~~- CachedVotesQty int(11) NOT NULL default '0',~~ ~~- CachedReviewsQty int(11) NOT NULL default '0',~~ ~~- CreatedById int(11) NOT NULL default '0',~~ ~~- ModifiedById int(11) NOT NULL default '0',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- `Status` tinyint(4) NOT NULL default '2',~~ ~~- EditorsPick tinyint(4) NOT NULL default '0',~~ ~~- Featured tinyint(4) NOT NULL default '0',~~ ~~- OnSale tinyint(1) NOT NULL default '0',~~ ~~- ResourceId int(11) default NULL,~~ ~~- HotItem tinyint(4) NOT NULL default '2',~~ ~~- PopItem tinyint(4) NOT NULL default '2',~~ ~~- NewItem tinyint(4) NOT NULL default '2',~~ ~~- InventoryStatus tinyint(4) NOT NULL default '0',~~ ~~- QtyInStock int(11) NOT NULL default '0',~~ ~~- QtyInStockMin int(11) NOT NULL default '0',~~ ~~- QtyReserved int(11) NOT NULL default '0',~~ ~~- QtyBackOrdered int(11) NOT NULL default '0',~~ ~~- QtyOnOrder int(11) NOT NULL default '0',~~ + Weight double(10,4) DEFAULT NULL, + ManufacturerId int(11) NOT NULL DEFAULT '0', + MSRP double DEFAULT NULL, + BackOrder tinyint(3) unsigned NOT NULL DEFAULT '2', + BackOrderDate int(11) DEFAULT NULL, + CreatedOn int(10) unsigned DEFAULT NULL, + Modified int(10) unsigned DEFAULT NULL, + Expire int(10) unsigned DEFAULT NULL, + Hits double NOT NULL DEFAULT '0', + CachedRating decimal(11,10) NOT NULL DEFAULT '0.0000000000', + CachedVotesQty int(11) NOT NULL DEFAULT '0', + CachedReviewsQty int(11) NOT NULL DEFAULT '0', + CreatedById int(11) NOT NULL DEFAULT '0', + ModifiedById int(11) NOT NULL DEFAULT '0', + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '2', + EditorsPick tinyint(4) NOT NULL DEFAULT '0', + Featured tinyint(4) NOT NULL DEFAULT '0', + OnSale tinyint(1) NOT NULL DEFAULT '0', + ResourceId int(11) DEFAULT NULL, + HotItem tinyint(4) NOT NULL DEFAULT '2', + PopItem tinyint(4) NOT NULL DEFAULT '2', + NewItem tinyint(4) NOT NULL DEFAULT '2', + InventoryStatus tinyint(4) NOT NULL DEFAULT '0', + QtyInStock int(11) NOT NULL DEFAULT '0', + QtyInStockMin int(11) NOT NULL DEFAULT '0', + QtyReserved int(11) NOT NULL DEFAULT '0', + QtyBackOrdered int(11) NOT NULL DEFAULT '0', + QtyOnOrder int(11) NOT NULL DEFAULT '0', InventoryComment text, ~~- AccessGroupId int(11) default NULL,~~ ~~- AccessDuration int(11) default NULL,~~ ~~- AccessDurationType tinyint(4) default NULL,~~ ~~- AccessStart int(11) default NULL,~~ ~~- AccessEnd int(11) default NULL,~~ ~~- Virtual tinyint(4) NOT NULL default '0',~~ + AccessGroupId int(11) DEFAULT NULL, + AccessDuration int(11) DEFAULT NULL, + AccessDurationType tinyint(4) DEFAULT NULL, + AccessStart int(11) DEFAULT NULL, + AccessEnd int(11) DEFAULT NULL, + Virtual tinyint(4) NOT NULL DEFAULT '0', ProcessingData text, PackageContent mediumtext NOT NULL, ~~- OptionsSelectionMode tinyint(4) default '0',~~ ~~- HasRequiredOptions tinyint(1) NOT NULL default '0',~~ ~~- IsRecurringBilling tinyint(3) unsigned NOT NULL default '0',~~ ~~- ShippingMode tinyint(1) NOT NULL default '0',~~ ~~- ShippingLimitation text NOT NULL,~~ ~~- AssignedCoupon int(11) NOT NULL default '0',~~ ~~- MinQtyFreePromoShipping int(11) NOT NULL default '0',~~ ~~- MetaKeywords varchar(255) default NULL,~~ + OptionsSelectionMode tinyint(4) DEFAULT '0', + HasRequiredOptions tinyint(1) NOT NULL DEFAULT '0', + IsRecurringBilling tinyint(3) unsigned NOT NULL DEFAULT '0', + ShippingMode tinyint(1) NOT NULL DEFAULT '0', + ShippingLimitation text, + AssignedCoupon int(11) NOT NULL DEFAULT '0', + MinQtyFreePromoShipping int(11) NOT NULL DEFAULT '0', + MetaKeywords varchar(255) DEFAULT NULL, MetaDescription text, ~~- PRIMARY KEY (ProductId),~~ + PRIMARY KEY (ProductId), KEY ResourceId (ResourceId), KEY Hits (Hits), ~~- KEY Name (Name),~~ + KEY `Name` (`Name`), KEY EditorsPick (EditorsPick), KEY CreatedOn (CreatedOn), KEY Modified (Modified,CreatedOn), @@ -433,47 +433,47 @@ ); CREATE TABLE ProductFiles ( ~~- FileId INT NOT NULL AUTO_INCREMENT,~~ ~~- ProductId INT NOT NULL,~~ ~~- Name VARCHAR(255) NOT NULL,~~ ~~- Version VARCHAR(100) NOT NULL,~~ ~~- FilePath VARCHAR(255) NOT NULL,~~ ~~- RealPath VARCHAR(255) NOT NULL,~~ ~~- Size INT NOT NULL,~~ ~~- Status tinyint(4) NOT NULL default '0',~~ ~~- IsPrimary tinyint(4) NOT NULL default '0',~~ ~~- Priority smallint(6) NOT NULL default '0',~~ ~~- AddedOn int(11) NOT NULL default '0',~~ ~~- AddedById int(11) NOT NULL default '0',~~ ~~- MIMEType varchar(255) NOT NULL default '',~~ + FileId int(11) NOT NULL AUTO_INCREMENT, + ProductId int(11) NOT NULL DEFAULT '0', + `Name` varchar(255) NOT NULL DEFAULT '', + Version varchar(100) NOT NULL DEFAULT '', + FilePath varchar(255) NOT NULL DEFAULT '', + RealPath varchar(255) NOT NULL DEFAULT '', + Size int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '0', + IsPrimary tinyint(4) NOT NULL DEFAULT '0', + Priority smallint(6) NOT NULL DEFAULT '0', + AddedOn int(11) DEFAULT NULL, + AddedById int(11) NOT NULL DEFAULT '0', + MIMEType varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (FileId), KEY ProductId (ProductId), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY IsPrimary (IsPrimary), KEY Priority (Priority), KEY AddedOn (AddedOn) ); CREATE TABLE UserFileAccess ( ~~- FileAccessId INT NOT NULL AUTO_INCREMENT,~~ ~~- ProductId INT NOT NULL,~~ ~~- PortalUserId INT NOT NULL,~~ + FileAccessId int(11) NOT NULL AUTO_INCREMENT, + ProductId int(11) NOT NULL DEFAULT '0', + PortalUserId int(11) NOT NULL DEFAULT '0', PRIMARY KEY (FileAccessId), KEY ProductId (ProductId), KEY PortalUserId (PortalUserId) ); CREATE TABLE UserDownloads ( ~~- DownloadId int(11) NOT NULL auto_increment,~~ ~~- PortalUserId int(11) NOT NULL default '0',~~ ~~- Username varchar(255) NOT NULL default '',~~ ~~- ProductId int(11) NOT NULL default '0',~~ ~~- ProductName varchar(255) NOT NULL default '',~~ ~~- FileId int(11) NOT NULL default '0',~~ ~~- Filename varchar(255) NOT NULL default '',~~ ~~- IPAddress varchar(100) NOT NULL default '',~~ ~~- StartedOn int(11) NOT NULL default '0',~~ ~~- EndedOn int(11) NOT NULL default '0',~~ + DownloadId int(11) NOT NULL AUTO_INCREMENT, + PortalUserId int(11) NOT NULL DEFAULT '0', + Username varchar(255) NOT NULL DEFAULT '', + ProductId int(11) NOT NULL DEFAULT '0', + ProductName varchar(255) NOT NULL DEFAULT '', + FileId int(11) NOT NULL DEFAULT '0', + Filename varchar(255) NOT NULL DEFAULT '', + IPAddress varchar(100) NOT NULL DEFAULT '', + StartedOn int(11) DEFAULT NULL, + EndedOn int(11) DEFAULT NULL, PRIMARY KEY (DownloadId), KEY PortalUserId (PortalUserId), KEY ProductId (ProductId) @@ -502,40 +502,40 @@ ); CREATE TABLE ShippingQuoteEngines ( ~~- EngineId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- FlatSurcharge double NOT NULL default '0',~~ ~~- PercentSurcharge double NOT NULL default '0',~~ ~~- Status smallint(6) NOT NULL default '0',~~ ~~- Properties text NOT NULL,~~ ~~- ClassName varchar(255) NOT NULL default '',~~ + EngineId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + FlatSurcharge double NOT NULL DEFAULT '0', + PercentSurcharge double NOT NULL DEFAULT '0', + `Status` smallint(6) NOT NULL DEFAULT '0', + Properties text, + ClassName varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (EngineId), ~~- KEY Status (Status)~~ + KEY `Status` (`Status`) ); CREATE TABLE ShippingType ( ~~- ShippingID int(11) NOT NULL auto_increment,~~ ~~- Code varchar(25) NOT NULL default '',~~ ~~- Name varchar(100) NOT NULL default '',~~ ~~- SpeedCode varchar(25) NOT NULL default '',~~ ~~- LocationFrom int(11) NOT NULL default '1',~~ ~~- `Type` int(11) NOT NULL default '1',~~ ~~- BaseFee double NOT NULL default '0',~~ ~~- CODFlatSurcharge double NOT NULL default '0',~~ ~~- CODPercentSurcharge double NOT NULL default '0',~~ ~~- `Status` tinyint(4) NOT NULL default '1',~~ ~~- CostType tinyint(4) NOT NULL default '1',~~ ~~- ZeroIfEmpty tinyint(4) NOT NULL default '1',~~ ~~- PrecisionBeforeSep tinyint(4) NOT NULL default '2',~~ ~~- PrecisionAfterSep tinyint(4) NOT NULL default '2',~~ ~~- PortalGroups text NOT NULL,~~ ~~- FreeShippingMinAmount double(10,4) NOT NULL default '0.0000',~~ ~~- IsFreePromoShipping tinyint(1) NOT NULL default '0',~~ ~~- InsuranceFee decimal(10,2) default NULL,~~ ~~- InsuranceType tinyint(1) NOT NULL default '2',~~ ~~- PRIMARY KEY (ShippingID),~~ + ShippingID int(11) NOT NULL AUTO_INCREMENT, + `Code` varchar(25) NOT NULL DEFAULT '', + `Name` varchar(100) NOT NULL DEFAULT '', + SpeedCode varchar(25) NOT NULL DEFAULT '', + LocationFrom int(11) NOT NULL DEFAULT '1', + `Type` int(11) NOT NULL DEFAULT '1', + BaseFee double NOT NULL DEFAULT '0', + CODFlatSurcharge double NOT NULL DEFAULT '0', + CODPercentSurcharge double NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', + CostType tinyint(4) NOT NULL DEFAULT '1', + ZeroIfEmpty tinyint(4) NOT NULL DEFAULT '1', + PrecisionBeforeSep tinyint(4) NOT NULL DEFAULT '2', + PrecisionAfterSep tinyint(4) NOT NULL DEFAULT '2', + PortalGroups text, + FreeShippingMinAmount double(10,4) NOT NULL DEFAULT '0.0000', + IsFreePromoShipping tinyint(1) NOT NULL DEFAULT '0', + InsuranceFee decimal(10,2) DEFAULT NULL, + InsuranceType tinyint(1) NOT NULL DEFAULT '2', + PRIMARY KEY (ShippingID), KEY `Type` (`Type`), ~~- KEY Status (Status)~~ + KEY `Status` (`Status`) ); CREATE TABLE ShippingZones ( @@ -580,29 +580,29 @@ ); CREATE TABLE AffiliatePayments ( ~~- AffiliatePaymentId int(11) NOT NULL auto_increment,~~ ~~- AffiliateId int(10) unsigned NOT NULL default '0',~~ ~~- PaymentDate int(10) unsigned NOT NULL default '0',~~ ~~- Amount decimal(10,2) NOT NULL default '0.00',~~ ~~- Comment text NOT NULL,~~ ~~- PaymentReference varchar(255) NOT NULL default '',~~ ~~- PaymentTypeId int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (AffiliatePaymentId),~~ + AffiliatePaymentId int(11) NOT NULL AUTO_INCREMENT, + AffiliateId int(10) unsigned NOT NULL DEFAULT '0', + PaymentDate int(10) unsigned DEFAULT NULL, + Amount decimal(10,2) NOT NULL DEFAULT '0.00', + `Comment` text, + PaymentReference varchar(255) NOT NULL DEFAULT '', + PaymentTypeId int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (AffiliatePaymentId), KEY AffiliateId (AffiliateId), KEY PaymentDate (PaymentDate), KEY PaymentTypeId (PaymentTypeId) ); CREATE TABLE AffiliatePaymentTypes ( ~~- PaymentTypeId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- Description text NOT NULL,~~ ~~- IsPrimary tinyint(4) NOT NULL default '0',~~ ~~- Status tinyint(4) NOT NULL default '0',~~ ~~- Priority tinyint(4) NOT NULL default '0',~~ ~~- PRIMARY KEY (PaymentTypeId),~~ + PaymentTypeId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + Description text, + IsPrimary tinyint(4) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '0', + Priority tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (PaymentTypeId), KEY IsPrimary (IsPrimary), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY Priority (Priority) ); @@ -643,47 +643,47 @@ ); CREATE TABLE Affiliates ( ~~- AffiliateId int(11) NOT NULL auto_increment,~~ ~~- PortalUserId int(10) unsigned NOT NULL default '0',~~ ~~- AffiliatePlanId int(10) unsigned NOT NULL default '0',~~ ~~- AccumulatedAmount decimal(10,2) NOT NULL default '0.00',~~ ~~- AmountToPay decimal(10,2) NOT NULL default '0.00',~~ ~~- LastPaymentDate INT(11) UNSIGNED NULL DEFAULT NULL,~~ ~~- LastOrderDate INT(11) UNSIGNED NULL DEFAULT NULL,~~ ~~- Status tinyint(4) NOT NULL default '2',~~ ~~- AffiliateCode varchar(30) NOT NULL default '',~~ ~~- ItemsSold int(10) unsigned NOT NULL default '0',~~ ~~- PaymentTypeId int(11) NOT NULL default '0',~~ ~~- SSN varchar(100) NOT NULL default '',~~ ~~- Comments text NOT NULL,~~ ~~- CreatedOn int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (AffiliateId),~~ + AffiliateId int(11) NOT NULL AUTO_INCREMENT, + PortalUserId int(10) unsigned NOT NULL DEFAULT '0', + AffiliatePlanId int(10) unsigned NOT NULL DEFAULT '0', + AccumulatedAmount decimal(10,2) NOT NULL DEFAULT '0.00', + AmountToPay decimal(10,2) NOT NULL DEFAULT '0.00', + LastPaymentDate int(11) unsigned DEFAULT NULL, + LastOrderDate int(11) unsigned DEFAULT NULL, + `Status` tinyint(4) NOT NULL DEFAULT '2', + AffiliateCode varchar(30) NOT NULL DEFAULT '', + ItemsSold int(10) unsigned NOT NULL DEFAULT '0', + PaymentTypeId int(11) NOT NULL DEFAULT '0', + SSN varchar(100) NOT NULL DEFAULT '', + Comments text, + CreatedOn int(11) DEFAULT NULL, + PRIMARY KEY (AffiliateId), UNIQUE KEY PortalUserId (PortalUserId), UNIQUE KEY AffiliateCode (AffiliateCode), KEY LastOrderDate (LastOrderDate), KEY AffiliatePlanId (AffiliatePlanId), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY PaymentTypeId (PaymentTypeId), KEY CreatedOn (CreatedOn) ); CREATE TABLE ProductOptionCombinations ( ~~- CombinationId int(11) NOT NULL auto_increment,~~ ~~- ProductId int(11) NOT NULL default '0',~~ ~~- Combination text NOT NULL,~~ ~~- CombinationCRC int(11) NOT NULL default '0',~~ ~~- PriceType tinyint(1) default '3',~~ ~~- Price float default NULL,~~ ~~- WeightType tinyint(1) default '3',~~ ~~- Weight float default NULL,~~ ~~- Availability tinyint(1) NOT NULL default '1',~~ ~~- Priority int(11) NOT NULL default '0',~~ ~~- QtyInStock int(11) NOT NULL default '0',~~ ~~- QtyReserved int(11) NOT NULL default '0',~~ ~~- QtyBackOrdered int(11) NOT NULL default '0',~~ ~~- QtyOnOrder int(11) NOT NULL default '0',~~ ~~- SKU varchar(255) NOT NULL default '',~~ ~~- PRIMARY KEY (CombinationId),~~ + CombinationId int(11) NOT NULL AUTO_INCREMENT, + ProductId int(11) NOT NULL DEFAULT '0', + Combination text, + CombinationCRC int(11) NOT NULL DEFAULT '0', + PriceType tinyint(1) DEFAULT '3', + Price float DEFAULT NULL, + WeightType tinyint(1) DEFAULT '3', + Weight float DEFAULT NULL, + Availability tinyint(1) NOT NULL DEFAULT '1', + Priority int(11) NOT NULL DEFAULT '0', + QtyInStock int(11) NOT NULL DEFAULT '0', + QtyReserved int(11) NOT NULL DEFAULT '0', + QtyBackOrdered int(11) NOT NULL DEFAULT '0', + QtyOnOrder int(11) NOT NULL DEFAULT '0', + SKU varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (CombinationId), KEY CombinationCRC (CombinationCRC), KEY ProductId (ProductId), KEY Availability (Availability) Index: in-commerce/install/upgrades.sql =================================================================== --- in-commerce/install/upgrades.sql (revision 12677) +++ in-commerce/install/upgrades.sql (working copy) @@ -57,4 +57,60 @@ UPDATE Events SET Type = 1 WHERE Event = 'BACKORDER.FULLFILL'; ~~-UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('product_RatingDelay_Value', 'product_ReviewDelay_Value');~~ \ No newline at end of file +UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('product_RatingDelay_Value', 'product_ReviewDelay_Value'); + +# ===== v 5.0.2 ===== +ALTER TABLE AffiliatePayments + CHANGE Comment Comment text NULL, + CHANGE PaymentDate PaymentDate INT(10) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE AffiliatePaymentTypes CHANGE Description Description text NULL; + +ALTER TABLE Affiliates + CHANGE Comments Comments text NULL, + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL; + +ALTER TABLE Manufacturers CHANGE Description Description text NULL; + +ALTER TABLE Orders + CHANGE UserComment UserComment text NULL, + CHANGE AdminComment AdminComment text NULL, + CHANGE GWResult1 GWResult1 MEDIUMTEXT NULL, + CHANGE GWResult2 GWResult2 MEDIUMTEXT NULL, + CHANGE OrderDate OrderDate INT(10) UNSIGNED NULL DEFAULT NULL, + CHANGE PaymentExpires PaymentExpires INT(10) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE PaymentTypes CHANGE PortalGroups PortalGroups text NULL; +ALTER TABLE ProductOptionCombinations CHANGE Combination Combination text NULL; + +ALTER TABLE Products + CHANGE ShippingLimitation ShippingLimitation text NULL, + CHANGE PackageContent PackageContent MEDIUMTEXT NULL; + +ALTER TABLE ShippingQuoteEngines CHANGE Properties Properties text NULL; +ALTER TABLE ShippingType CHANGE PortalGroups PortalGroups text NULL; + +ALTER TABLE ProductFiles + CHANGE ProductId ProductId INT(11) NOT NULL DEFAULT '0', + CHANGE `Name` `Name` VARCHAR(255) NOT NULL DEFAULT '', + CHANGE Version Version VARCHAR(100) NOT NULL DEFAULT '', + CHANGE FilePath FilePath VARCHAR(255) NOT NULL DEFAULT '', + CHANGE RealPath RealPath VARCHAR(255) NOT NULL DEFAULT '', + CHANGE Size Size INT(11) NOT NULL DEFAULT '0', + CHANGE AddedOn AddedOn INT(11) NULL DEFAULT NULL; + +ALTER TABLE UserFileAccess + CHANGE ProductId ProductId INT( 11 ) NOT NULL DEFAULT '0', + CHANGE PortalUserId PortalUserId INT( 11 ) NOT NULL DEFAULT '0'; + +ALTER TABLE GatewayConfigFields CHANGE ValueList ValueList MEDIUMTEXT NULL; + +ALTER TABLE Currencies + CHANGE `Status` `Status` SMALLINT(6) NOT NULL DEFAULT '1', + CHANGE Modified Modified INT(11) NULL DEFAULT NULL; + +ALTER TABLE GiftCertificates CHANGE `Status` `Status` TINYINT(1) NOT NULL DEFAULT '2'; + +ALTER TABLE UserDownloads + CHANGE StartedOn StartedOn INT(11) NULL DEFAULT NULL, + CHANGE EndedOn EndedOn INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-commerce/units/affiliate_payment_types/affiliate_payment_types_config.php =================================================================== --- in-commerce/units/affiliate_payment_types/affiliate_payment_types_config.php (revision 12677) +++ in-commerce/units/affiliate_payment_types/affiliate_payment_types_config.php (working copy) @@ -82,7 +82,7 @@ 'Fields' => Array( 'PaymentTypeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''), ~~- 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'IsPrimary' => Array('type' => 'int','not_null' => 1, 'default' => 0), 'Status' => Array('type' => 'int','not_null' => 1, 'default' => 0), 'Priority' => Array('type' => 'int','not_null' => 1, 'default' => 0), Index: in-commerce/units/affiliate_payments/affiliate_payments_config.php =================================================================== --- in-commerce/units/affiliate_payments/affiliate_payments_config.php (revision 12677) +++ in-commerce/units/affiliate_payments/affiliate_payments_config.php (working copy) @@ -109,9 +109,9 @@ 'Fields' => Array( 'AffiliatePaymentId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'), 'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0), ~~- 'PaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1','default' => '#NOW#'),~~ + 'PaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default' => '#NOW#'), 'Amount' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1', 'required'=>1, 'default' => '0.00'), ~~- 'Comment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'Comment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'PaymentReference' => Array('type' => 'string','not_null' => '1','default' => ''), 'PaymentTypeId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options_sql'=>'SELECT Name, PaymentTypeId FROM '.TABLE_PREFIX.'AffiliatePaymentTypes WHERE Status = 1 ORDER BY IsPrimary DESC, Priority DESC, Name ASC', 'option_key_field'=>'PaymentTypeId', 'option_title_field'=>'Name', 'not_null' => 1, 'default' => 0), ), Index: in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php =================================================================== --- in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php (revision 12677) +++ in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php (working copy) @@ -88,8 +88,8 @@ 'ItemName' => Array(), 'SKU' => Array(), 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f'), ~~- 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#' ),~~ ~~- 'BackOrderDate' => Array('formatter' => 'kDateFormatter'),~~ + 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'BackOrderDate' => Array('formatter' => 'kDateFormatter', 'default' => NULL), ), 'Grids' => Array( Index: in-commerce/units/affiliates/affiliates_config.php =================================================================== --- in-commerce/units/affiliates/affiliates_config.php (revision 12677) +++ in-commerce/units/affiliates/affiliates_config.php (working copy) @@ -168,15 +168,15 @@ 'AffiliatePlanId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options_sql'=>'SELECT Name, AffiliatePlanId FROM '.TABLE_PREFIX.'AffiliatePlans WHERE Enabled = 1 ORDER BY Name', 'option_key_field'=>'AffiliatePlanId', 'option_title_field'=>'Name', 'not_null' => 1, 'default' => 0), 'AccumulatedAmount' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1','default' => '0.00'), 'AmountToPay' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1','default' => '0.00'), ~~- 'LastPaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default' => null),~~ ~~- 'LastOrderDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),~~ + 'LastPaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default' => NULL), + 'LastOrderDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Active', 2=>'la_Pending', 0=>'la_Disabled'), 'use_phrases'=>1, 'not_null' => '1','default' => 2), 'AffiliateCode' => Array('type' => 'string', 'not_null' => '1', 'default' => ''), 'ItemsSold' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'PaymentTypeId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(0 => ''), 'options_sql'=>'SELECT Name, PaymentTypeId FROM '.TABLE_PREFIX.'AffiliatePaymentTypes WHERE Status = 1 ORDER BY IsPrimary DESC, Priority DESC, Name ASC', 'option_key_field'=>'PaymentTypeId', 'option_title_field'=>'Name', 'not_null' => 1, 'default' => 0), 'SSN' => Array('type' => 'string','not_null' => '1','default' => '', 'required' => 1), ~~- 'Comments' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ ~~- 'CreatedOn' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1', 'default' => '#NOW#'),~~ + 'Comments' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), ), 'VirtualFields' => Array( 'UserName' => Array('type'=>'string', 'default' => ''), Index: in-commerce/units/coupon_items/coupon_items_config.php =================================================================== --- in-commerce/units/coupon_items/coupon_items_config.php (revision 12677) +++ in-commerce/units/coupon_items/coupon_items_config.php (working copy) @@ -91,8 +91,8 @@ 'ItemName' => Array(), 'SKU' => Array(), 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f'), ~~- 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#' ),~~ ~~- 'BackOrderDate' => Array('formatter' => 'kDateFormatter'),~~ + 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'BackOrderDate' => Array('formatter' => 'kDateFormatter', 'default' => NULL), ), 'Grids' => Array( Index: in-commerce/units/coupons/coupons_config.php =================================================================== --- in-commerce/units/coupons/coupons_config.php (revision 12677) +++ in-commerce/units/coupons/coupons_config.php (working copy) @@ -144,7 +144,7 @@ WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId', 'left_title_field' => 'Login', 'required' => 0, 'default' => null, ), ~~- 'LastUsedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),~~ + 'LastUsedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'NumberOfUses' => Array ('type' => 'int', 'default' => 1), ), Index: in-commerce/units/currencies/currencies_config.php =================================================================== --- in-commerce/units/currencies/currencies_config.php (revision 12677) +++ in-commerce/units/currencies/currencies_config.php (working copy) @@ -110,7 +110,7 @@ 'SymbolPosition' => Array ('type' => 'int', 'default' => null,'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Left', 1 => 'la_Right'),'use_phrases' => '1'), 'Name' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), 'RateToPrimary' => Array ('type' => 'float', 'not_null' => 1, 'min_value_exc' => 0, 'formatter' => 'kFormatter', 'format' => '%0.4f', 'default' => 1), ~~- 'Modified' => Array ('type' => 'int', 'not_null' => 1, 'default' => '#NOW#', 'formatter' => 'kDateFormatter'),~~ + 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'Status' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1, 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'formatter' => 'kOptionsFormatter'), 'IsPrimary' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), Index: in-commerce/units/discount_items/discount_items_config.php =================================================================== --- in-commerce/units/discount_items/discount_items_config.php (revision 12677) +++ in-commerce/units/discount_items/discount_items_config.php (working copy) @@ -91,8 +91,8 @@ 'ItemName' => Array(), 'SKU' => Array(), 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f'), ~~- 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#' ),~~ ~~- 'BackOrderDate' => Array('formatter' => 'kDateFormatter'),~~ + 'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'BackOrderDate' => Array('formatter' => 'kDateFormatter', 'default' => NULL), ), 'Grids' => Array( Index: in-commerce/units/downloads/downloads_config.php =================================================================== --- in-commerce/units/downloads/downloads_config.php (revision 12677) +++ in-commerce/units/downloads/downloads_config.php (working copy) @@ -84,8 +84,8 @@ 'FileId' => Array('type' => 'int','not_null' => 1, 'default' => 0), 'Filename' => Array('type' => 'string','not_null' => 1, 'default' => ''), 'IPAddress' => Array('type' => 'string','not_null' => 1, 'default' => ''), ~~- 'StartedOn' => Array('type' => 'int','formatter' => 'kDateFormatter','not_null' => 1, 'default' => 0),~~ ~~- 'EndedOn' => Array('type' => 'int','formatter' => 'kDateFormatter','not_null' => 1, 'default' => 0),~~ + 'StartedOn' => Array('type' => 'int','formatter' => 'kDateFormatter', 'default' => NULL), + 'EndedOn' => Array('type' => 'int','formatter' => 'kDateFormatter', 'default' => NULL), ), 'VirtualFields' => Array( ), Index: in-commerce/units/files/files_config.php =================================================================== --- in-commerce/units/files/files_config.php (revision 12677) +++ in-commerce/units/files/files_config.php (working copy) @@ -90,7 +90,7 @@ 'Status' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'IsPrimary' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'AddedOn' => Array('type' => 'int','formatter' => 'kDateFormatter','not_null' => '1','default' => '#NOW#'),~~ + 'AddedOn' => Array('type' => 'int','formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'AddedById' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'MIMEType' => Array('type' => 'string','not_null' => '1','default' => ''), ), Index: in-commerce/units/gateways/gateways_config.php =================================================================== --- in-commerce/units/gateways/gateways_config.php (revision 12677) +++ in-commerce/units/gateways/gateways_config.php (working copy) @@ -60,7 +60,7 @@ 'SystemFieldName' => Array('type' => 'string', 'not_null' => 1, 'default' => 0, ), 'FieldName' => Array('type' => 'string', 'required' => true, 'max_len' => 100, 'not_null' => 1, 'default' => 0, ), 'ElementType' => Array('type' => 'string', 'not_null' => 1, 'default' => 0, ), ~~- 'ValueList' => Array('type' => 'string', 'not_null' => 1, 'default' => 0, ),~~ + 'ValueList' => Array('type' => 'string', 'default' => NULL), 'GatewayId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), ), Index: in-commerce/units/manufacturers/manufacturers_config.php =================================================================== --- in-commerce/units/manufacturers/manufacturers_config.php (revision 12677) +++ in-commerce/units/manufacturers/manufacturers_config.php (working copy) @@ -88,7 +88,7 @@ 'Fields' => Array ( 'ManufacturerId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'Name' => Array('type' => 'string','not_null' => '1','default' => '', 'required'=>true,'max_len'=>255), ~~- 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'URL' => Array('type' => 'string','not_null' => '1','default' => '','max_len'=>255), 'Logo' => Array ( 'type' => 'string', Index: in-commerce/units/orders/orders_config.php =================================================================== --- in-commerce/units/orders/orders_config.php (revision 12677) +++ in-commerce/units/orders/orders_config.php (working copy) @@ -310,11 +310,11 @@ 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0 ), ~~- 'OrderDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'required' => 1, 'not_null' => '1', 'default' => '#NOW#'),~~ + 'OrderDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'PortalUserId'=>Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options'=>Array(-1=>'root',-2=>'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId','left_title_field'=>'Login','required'=>1,'not_null'=>1,'default'=>-1), 'OrderIP' => Array('type' => 'string','not_null' => '1','default' => '', 'filter_type' => 'like'), ~~- 'UserComment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ ~~- 'AdminComment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'UserComment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'AdminComment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'BillingTo' => Array('type' => 'string','not_null' => '1','default' => ''), 'BillingCompany' => Array('type' => 'string','not_null' => '1','default' => ''), 'BillingPhone' => Array('type' => 'string','not_null' => '1','default' => ''), @@ -347,7 +347,7 @@ 'PaymentNameOnCard' => Array('type' => 'string','not_null' => '1','default' => ''), 'PaymentCCExpDate' => Array('type' => 'string', 'formatter'=>'kCCDateFormatter', 'month_field' => 'PaymentCCExpMonth', 'year_field'=>'PaymentCCExpYear', 'not_null' => '1','default' => ''), 'PaymentCardType' => Array('type' => 'string', 'not_null' => 1, 'formatter'=>'kOptionsFormatter', 'options' => Array('' => '','1' => 'Visa','2' => 'Mastercard', '3' => 'Amex', '4' => 'Discover', '5' => 'Diners Club', '6' => 'JBC'), 'default' => ''), ~~- 'PaymentExpires' => Array('type' => 'int', 'formatter'=>'kDateFormatter','not_null' => '1','default' => '#NOW#'),~~ + 'PaymentExpires' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'ShippingTo' => Array('type' => 'string','not_null' => '1','default' => ''), 'ShippingCompany' => Array('type' => 'string','not_null' => '1','default' => ''), 'ShippingPhone' => Array('type' => 'string','not_null' => '1','default' => ''), @@ -377,7 +377,7 @@ 'ShippingCost' => Array('type' => 'double','formatter'=>'kFormatter','format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), 'ShippingCustomerAccount' => Array('type' => 'string','not_null' => '1','default' => ''), 'ShippingTracking' => Array('type' => 'string','not_null' => '1','default' => ''), ~~- 'ShippingDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter','default' => null),~~ + 'ShippingDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), 'SubTotal' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), 'ReturnTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), 'CostTotal' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), @@ -391,8 +391,8 @@ 'CouponDiscount' => Array('type' => 'float','not_null' => '1','default' => '0.00','formatter'=>'kFormatter','format'=>'%01.2f'), 'DiscountTotal' => Array('type' => 'float','not_null' => '1','default' => '0.00','formatter'=>'kFormatter','format'=>'%01.2f'), 'TransactionStatus' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(0=>'la_Invalid', 1 => 'la_Verified', 2 => 'la_Penging'), 'use_phrases'=>1, 'not_null' => '1','default' => 2), ~~- 'GWResult1' => Array('type' => 'string', 'formatter'=>'kSerializedFormatter', 'not_null' => '1','default' => ''),~~ ~~- 'GWResult2' => Array('type' => 'string', 'formatter'=>'kSerializedFormatter', 'not_null' => '1','default' => ''),~~ + 'GWResult1' => Array('type' => 'string', 'formatter'=>'kSerializedFormatter', 'default' => NULL), + 'GWResult2' => Array('type' => 'string', 'formatter'=>'kSerializedFormatter', 'default' => NULL), 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0), 'VisitId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'AffiliateCommission' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'), Index: in-commerce/units/payment_type/payment_type_config.php =================================================================== --- in-commerce/units/payment_type/payment_type_config.php (revision 12677) +++ in-commerce/units/payment_type/payment_type_config.php (working copy) @@ -119,7 +119,7 @@ 'GatewayId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Gateways', 'option_key_field' => 'GatewayId', 'option_title_field' => 'Name', 'default' => 1, 'not_null' => 1), 'PlacedOrdersEdit' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'ProcessingFee' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'default' => '0.00'), ~~- 'PortalGroups' => Array ('type' => 'string', 'not_null' => 1, 'default' => '',),~~ + 'PortalGroups' => Array ('type' => 'string', 'default' => NULL), ), /* 'VirtualFields' => Array ( 'Qty' => 1, Index: in-commerce/units/product_option_combinations/product_option_combinations_config.php =================================================================== --- in-commerce/units/product_option_combinations/product_option_combinations_config.php (revision 12677) +++ in-commerce/units/product_option_combinations/product_option_combinations_config.php (working copy) @@ -60,7 +60,7 @@ 'Fields' => Array ( 'CombinationId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), 'ProductId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), ~~- 'Combination' => Array('type' => 'string', 'required' => 1, 'formatter' => 'kCombinationFormatter', 'format'=>"%s: %s<br>", 'not_null' => 1, 'default' => '', ),~~ + 'Combination' => Array('type' => 'string', 'required' => 1, 'formatter' => 'kCombinationFormatter', 'format'=>"%s: %s<br>", 'default' => NULL), 'CombinationCRC' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), 'PriceType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Txt_=', 2 => 'la_Flat', 3 => 'la_Percent'), 'use_phrases' => 1, 'default' => 3, ), 'Price' => Array('type' => 'float', 'required' => 1, 'formatter' => 'kFormatter', 'default' => '', ), Index: in-commerce/units/products/products_config.php =================================================================== --- in-commerce/units/products/products_config.php (revision 12685) +++ in-commerce/units/products/products_config.php (working copy) @@ -469,14 +469,14 @@ 'HasRequiredOptions' => Array('type' => 'int', 'default' => 0, 'not_null' => 1), 'Virtual' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'ProcessingData' => Array('type' => 'string', 'default' => ''), ~~- 'PackageContent' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'PackageContent' => Array('type' => 'string', 'default' => NULL), 'IsRecurringBilling' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), // 'PayPalRecurring' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => '1', 'default' => '0'), 'ShippingMode' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(0 => 'la_shipping_AnyAndSelected', 1 => 'la_shipping_Limited'), 'not_null' => 1, 'default'=>0), 'ProcessingData' => Array('type' => 'string', 'default' => null), ~~- 'ShippingLimitation' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),~~ + 'ShippingLimitation' => Array('type' => 'string', 'default' => NULL), 'AssignedCoupon' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, 'formatter'=>'kLEFTFormatter', Index: in-commerce/units/shipping/shipping_config.php =================================================================== --- in-commerce/units/shipping/shipping_config.php (revision 12677) +++ in-commerce/units/shipping/shipping_config.php (working copy) @@ -139,7 +139,7 @@ 'ZeroIfEmpty' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Zeros', 0 => 'la_NoShipments' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => true ), 'PrecisionBeforeSep' => Array ('type' => 'int', 'options' => Array ( 1 => '1 digit', 2 => '2 digits', 3 => '3 digits', 4 => '4 digits' ), 'default' => 2, 'not_null' => true ), 'PrecisionAfterSep' => Array ('type' => 'int', 'options' => Array ( 0 => 'none', 1 => '1 digit', 2 => '2 digits' ), 'default' => 2, 'not_null' => true ), ~~- 'PortalGroups' => Array ('type' => 'string', 'not_null' => 1, 'default' => 0,),~~ + 'PortalGroups' => Array ('type' => 'string', 'default' => NULL), 'FreeShippingMinAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' => 1, 'format' => '%.2f', 'default' => 0), 'IsFreePromoShipping' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'use_phrases' => 1, 'options' => Array (0 => 'la_No', 1 => 'la_Yes', ), 'formatter' => 'kOptionsFormatter'), 'InsuranceFee' => Array ('type' => 'float', 'default' => null), Index: in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php =================================================================== --- in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (revision 12677) +++ in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (working copy) @@ -91,7 +91,7 @@ 'FlatSurcharge' => Array ('type' => 'double', 'not_null' => '1', 'default' => '0'), 'PercentSurcharge' => Array ('type' => 'double', 'not_null' => '1', 'default' => '0'), 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Enabled', 0 => 'la_Disabled' ), 'default' => 0, 'not_null' => 1), ~~- 'Properties' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),~~ + 'Properties' => Array ('type' => 'string', 'default' => NULL), 'ClassName' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), ), Index: in-link/install/install_schema.sql =================================================================== --- in-link/install/install_schema.sql (revision 12677) +++ in-link/install/install_schema.sql (working copy) @@ -61,12 +61,12 @@ ); CREATE TABLE LinkValidation ( ~~- LinkValidationId int(11) NOT NULL auto_increment,~~ ~~- LinkId int(11) NOT NULL default '0',~~ ~~- ValidationTime double NOT NULL default '0',~~ ~~- ValidationCode varchar(50) default NULL,~~ ~~- ValidationStatus tinyint(4) NOT NULL default '0',~~ ~~- PRIMARY KEY (LinkValidationId),~~ + LinkValidationId int(11) NOT NULL AUTO_INCREMENT, + LinkId int(11) NOT NULL DEFAULT '0', + ValidationTime int(11) DEFAULT NULL, + ValidationCode varchar(50) DEFAULT NULL, + ValidationStatus tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (LinkValidationId), UNIQUE KEY LinkId (LinkId), KEY ValidationStatus (ValidationStatus), KEY ValidationTime (ValidationTime) @@ -91,38 +91,38 @@ ); CREATE TABLE ListingTypes ( ~~- ListingTypeId int(11) NOT NULL auto_increment,~~ ~~- Name varchar(255) NOT NULL default '',~~ ~~- Description text NOT NULL,~~ ~~- Duration int(11) NOT NULL default '0',~~ ~~- DurationType int(11) NOT NULL default '0',~~ ~~- OnPurchaseEdPick tinyint(4) NOT NULL default '3',~~ ~~- OnPurchaseNew tinyint(4) NOT NULL default '3',~~ ~~- OnPurchasePop tinyint(4) NOT NULL default '3',~~ ~~- OnPurchaseHot tinyint(4) NOT NULL default '3',~~ ~~- OnPurchasePriorityAction tinyint(4) NOT NULL default '0',~~ ~~- OnPurchasePriorityValue tinyint(4) NOT NULL default '1',~~ ~~- OnPurchaseAddToCatEnabled tinyint(4) NOT NULL default '0',~~ ~~- OnPurchaseAddToCat int(11) NOT NULL default '0',~~ ~~- OnPurchaseCustomTemplate varchar(255) NOT NULL default '',~~ ~~- OnPurchaseStatus tinyint(4) NOT NULL default '3',~~ ~~- OnExpireEdPick tinyint(4) NOT NULL default '3',~~ ~~- OnExpireNew tinyint(4) NOT NULL default '3',~~ ~~- OnExpirePop tinyint(4) NOT NULL default '3',~~ ~~- OnExpireHot tinyint(4) NOT NULL default '3',~~ ~~- OnExpirePriorityAction tinyint(4) NOT NULL default '0',~~ ~~- OnExpirePriorityValue tinyint(4) NOT NULL default '1',~~ ~~- OnExpireRemoveFromCatEnabled tinyint(4) NOT NULL default '0',~~ ~~- OnExpireRemoveFromCat int(11) NOT NULL default '0',~~ ~~- OnExpireCustomTemplate varchar(255) NOT NULL default '',~~ ~~- OnExpireStatus tinyint(4) NOT NULL default '3',~~ ~~- RenewalReminder int(11) NOT NULL default '0',~~ ~~- EnableBuying tinyint(4) NOT NULL default '0',~~ ~~- ShopCartName varchar(255) default NULL,~~ ~~- Price double default NULL,~~ ~~- Recurring tinyint(4) NOT NULL default '0',~~ ~~- VirtualProductId int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (ListingTypeId),~~ + ListingTypeId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + Description text, + Duration int(11) NOT NULL DEFAULT '0', + DurationType int(11) NOT NULL DEFAULT '0', + OnPurchaseEdPick tinyint(4) NOT NULL DEFAULT '3', + OnPurchaseNew tinyint(4) NOT NULL DEFAULT '3', + OnPurchasePop tinyint(4) NOT NULL DEFAULT '3', + OnPurchaseHot tinyint(4) NOT NULL DEFAULT '3', + OnPurchasePriorityAction tinyint(4) NOT NULL DEFAULT '0', + OnPurchasePriorityValue tinyint(4) NOT NULL DEFAULT '1', + OnPurchaseAddToCatEnabled tinyint(4) NOT NULL DEFAULT '0', + OnPurchaseAddToCat int(11) NOT NULL DEFAULT '0', + OnPurchaseCustomTemplate varchar(255) NOT NULL DEFAULT '', + OnPurchaseStatus tinyint(4) NOT NULL DEFAULT '3', + OnExpireEdPick tinyint(4) NOT NULL DEFAULT '3', + OnExpireNew tinyint(4) NOT NULL DEFAULT '3', + OnExpirePop tinyint(4) NOT NULL DEFAULT '3', + OnExpireHot tinyint(4) NOT NULL DEFAULT '3', + OnExpirePriorityAction tinyint(4) NOT NULL DEFAULT '0', + OnExpirePriorityValue tinyint(4) NOT NULL DEFAULT '1', + OnExpireRemoveFromCatEnabled tinyint(4) NOT NULL DEFAULT '0', + OnExpireRemoveFromCat int(11) NOT NULL DEFAULT '0', + OnExpireCustomTemplate varchar(255) NOT NULL DEFAULT '', + OnExpireStatus tinyint(4) NOT NULL DEFAULT '3', + RenewalReminder int(11) NOT NULL DEFAULT '0', + EnableBuying tinyint(4) NOT NULL DEFAULT '0', + ShopCartName varchar(255) DEFAULT NULL, + Price double DEFAULT NULL, + Recurring tinyint(4) NOT NULL DEFAULT '0', + VirtualProductId int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (ListingTypeId), KEY VirtualProductId (VirtualProductId) ); @@ -134,11 +134,11 @@ ); CREATE TABLE LinkVisits ( ~~- VisitId int(11) NOT NULL auto_increment,~~ ~~- ResourceId int(11) default NULL,~~ ~~- PortalUserId int(11) NOT NULL default '0',~~ ~~- VisitTimestamp int(11) NOT NULL default '0',~~ ~~- PRIMARY KEY (VisitId),~~ + VisitId int(11) NOT NULL AUTO_INCREMENT, + ResourceId int(11) DEFAULT NULL, + PortalUserId int(11) NOT NULL DEFAULT '0', + VisitTimestamp int(11) DEFAULT NULL, + PRIMARY KEY (VisitId), KEY ResourceId (ResourceId), KEY PortalUserId (PortalUserId), KEY VisitTimestamp (VisitTimestamp) Index: in-link/install/upgrades.sql =================================================================== --- in-link/install/upgrades.sql (revision 12677) +++ in-link/install/upgrades.sql (working copy) @@ -50,4 +50,9 @@ INSERT INTO Events VALUES(DEFAULT, 'LINK.REVIEW.ADD.PENDING', NULL, 1, 0, NULL, 'In-Link', 'la_event_link.review.add.pending', 1); ~~-UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('link_ReviewDelay_Value', 'link_RatingDelay_Value');~~ \ No newline at end of file +UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('link_ReviewDelay_Value', 'link_RatingDelay_Value'); + +# ===== v 5.0.2 ===== +ALTER TABLE ListingTypes CHANGE Description Description text NULL; +ALTER TABLE LinkValidation CHANGE ValidationTime ValidationTime INT NULL DEFAULT NULL; +ALTER TABLE LinkVisits CHANGE VisitTimestamp VisitTimestamp INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-link/units/l-visits/l-visits_config.php =================================================================== --- in-link/units/l-visits/l-visits_config.php (revision 12677) +++ in-link/units/l-visits/l-visits_config.php (working copy) @@ -80,6 +80,6 @@ 'VisitId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'ResourceId' => Array ('type' => 'int', 'default' => NULL), 'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'VisitTimestamp' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => '#NOW#'),~~ + 'VisitTimestamp' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), ), ); \ No newline at end of file Index: in-link/units/link_validation/link_validation_config.php =================================================================== --- in-link/units/link_validation/link_validation_config.php (revision 12677) +++ in-link/units/link_validation/link_validation_config.php (working copy) @@ -114,7 +114,7 @@ 'Fields' => Array ( 'LinkValidationId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'LinkId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'ValidationTime' => Array ('type' => 'float', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),~~ + 'ValidationTime' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'ValidationCode' => Array ( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (200 => '200 OK', 301 => '301 Moved Permanently', 302 => '302 Found', 400 => '400 Bad Request', 403 => '403 Forbidden', 404 => '404 Not Found', 500 => '500 Internal Server Error'), Index: in-link/units/listing_types/listing_types_config.php =================================================================== --- in-link/units/listing_types/listing_types_config.php (revision 12677) +++ in-link/units/listing_types/listing_types_config.php (working copy) @@ -98,7 +98,7 @@ ( 'ListingTypeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required' => '1'), ~~- 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),~~ + 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'Duration' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'DurationType' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, 'formatter'=>'kOptionsFormatter','use_phrases' => 1,'options' => Array(1 => 'la_opt_sec', 2 => 'la_opt_min', 3 => 'la_opt_hour', 4 => 'la_opt_day', 5 => 'la_opt_week', 6 => 'la_opt_month', 7 => 'la_opt_year')), 'OnPurchaseEdPick' => Array('type' => 'int','not_null' => '1','formatter'=>'kOptionsFormatter','use_phrases' => 1,'options' => Array(3 => 'la_Unchanged', 1 => 'la_On', 0 => 'la_Off'), 'default' => 3), Index: in-news/install/install_schema.sql =================================================================== --- in-news/install/install_schema.sql (revision 12677) +++ in-news/install/install_schema.sql (working copy) @@ -1,19 +1,19 @@ CREATE TABLE News ( ~~- NewsId int(11) NOT NULL auto_increment,~~ ~~- Title varchar(255) NOT NULL default '',~~ ~~- l1_Title varchar(255) NOT NULL default '',~~ ~~- l2_Title varchar(255) NOT NULL default '',~~ ~~- l3_Title varchar(255) NOT NULL default '',~~ ~~- l4_Title varchar(255) NOT NULL default '',~~ ~~- l5_Title varchar(255) NOT NULL default '',~~ ~~- AutomaticFilename tinyint(3) unsigned NOT NULL default '1',~~ + NewsId int(11) NOT NULL AUTO_INCREMENT, + Title varchar(255) NOT NULL DEFAULT '', + l1_Title varchar(255) NOT NULL DEFAULT '', + l2_Title varchar(255) NOT NULL DEFAULT '', + l3_Title varchar(255) NOT NULL DEFAULT '', + l4_Title varchar(255) NOT NULL DEFAULT '', + l5_Title varchar(255) NOT NULL DEFAULT '', + AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1', Excerpt text, l1_Excerpt text, l2_Excerpt text, l3_Excerpt text, l4_Excerpt text, l5_Excerpt text, ~~- Author varchar(255) NOT NULL default '',~~ + Author varchar(255) NOT NULL DEFAULT '', Body text, l1_Body text, l2_Body text, @@ -21,30 +21,30 @@ l4_Body text, l5_Body text, MetaKeywords varchar(255) DEFAULT NULL, ~~- MetaDescription text NULL DEFAULT NULL,~~ ~~- CreatedOn int(11) NOT NULL default '0',~~ ~~- TextFormat int(11) NOT NULL default '0',~~ ~~- EndOn INT(11) NULL DEFAULT NULL,~~ ~~- Hits double(20,6) NOT NULL default '0.000000',~~ ~~- CachedRating varchar(10) default '0',~~ ~~- CachedVotesQty int(11) NOT NULL default '0',~~ ~~- CreatedById int(11) NOT NULL default '-1',~~ ~~- Priority INT(11) NOT NULL DEFAULT '0',~~ ~~- `Status` tinyint(4) NOT NULL default '2',~~ ~~- EditorsPick tinyint(4) NOT NULL default '0',~~ ~~- LeadStory tinyint(4) NOT NULL default '0',~~ ~~- LeadCatStory tinyint(4) NOT NULL default '0',~~ ~~- ResourceId int(11) default NULL,~~ ~~- CachedReviewsQty int(11) NOT NULL default '0',~~ ~~- StartDate int(11) NOT NULL default '0',~~ ~~- NewItem tinyint(4) NOT NULL default '2',~~ ~~- PopItem tinyint(4) NOT NULL default '2',~~ ~~- HotItem tinyint(4) NOT NULL default '2',~~ ~~- Archived int(11) NOT NULL default '0',~~ ~~- Modified int(11) NOT NULL default '0',~~ ~~- ModifiedById int(11) NOT NULL default '-1',~~ ~~- OrgId int(11) default NULL,~~ ~~- PRIMARY KEY (NewsId),~~ + MetaDescription text, + CreatedOn int(11) DEFAULT NULL, + TextFormat int(11) NOT NULL DEFAULT '0', + EndOn int(11) DEFAULT NULL, + Hits double(20,6) NOT NULL DEFAULT '0.000000', + CachedRating varchar(10) DEFAULT '0', + CachedVotesQty int(11) NOT NULL DEFAULT '0', + CreatedById int(11) NOT NULL DEFAULT '-1', + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '2', + EditorsPick tinyint(4) NOT NULL DEFAULT '0', + LeadStory tinyint(4) NOT NULL DEFAULT '0', + LeadCatStory tinyint(4) NOT NULL DEFAULT '0', + ResourceId int(11) DEFAULT NULL, + CachedReviewsQty int(11) NOT NULL DEFAULT '0', + StartDate int(11) DEFAULT NULL, + NewItem tinyint(4) NOT NULL DEFAULT '2', + PopItem tinyint(4) NOT NULL DEFAULT '2', + HotItem tinyint(4) NOT NULL DEFAULT '2', + Archived int(11) NOT NULL DEFAULT '0', + Modified int(11) DEFAULT NULL, + ModifiedById int(11) NOT NULL DEFAULT '-1', + OrgId int(11) DEFAULT NULL, + PRIMARY KEY (NewsId), UNIQUE KEY ResourceId (ResourceId), KEY Title (Title), KEY l1_Title (l1_Title), @@ -67,7 +67,7 @@ KEY CreatedOn (CreatedOn), KEY EndOn (EndOn), KEY Priority (Priority), ~~- KEY Status (Status),~~ + KEY `Status` (`Status`), KEY EditorsPick (EditorsPick), KEY Hits (Hits), KEY Modified (Modified), Index: in-news/install/upgrades.sql =================================================================== --- in-news/install/upgrades.sql (revision 12677) +++ in-news/install/upgrades.sql (working copy) @@ -49,4 +49,10 @@ INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.add.pending', 1); ~~-UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('News_ReviewDelay_Value', 'News_RatingDelay_Value');~~ \ No newline at end of file +UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('News_ReviewDelay_Value', 'News_RatingDelay_Value'); + +# ===== v 5.0.2 ===== +ALTER TABLE News + CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL, + CHANGE StartDate StartDate INT(11) NULL DEFAULT NULL, + CHANGE Modified Modified INT(11) NULL DEFAULT NULL; \ No newline at end of file Index: in-news/units/articles/articles_config.php =================================================================== --- in-news/units/articles/articles_config.php (revision 12677) +++ in-news/units/articles/articles_config.php (working copy) @@ -341,7 +341,7 @@ 'Excerpt' => Array('type' => 'string', /*'formatter' => 'kMultiLanguage',*/ 'default' => null), 'Author' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'Body' => Array('type' => 'string', 'formatter' => 'kFormatter',/*'kMultiLanguage'*/ 'using_fck' => 1, 'required' => 1, 'default' => null), ~~- 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1,'default' => '#NOW#'),~~ + 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'TextFormat' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'EndOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), 'Hits' => Array('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0), @@ -355,12 +355,12 @@ 'LeadCatStory' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'ResourceId' => Array('type' => 'int', 'default' => null), 'CachedReviewsQty' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), ~~- 'StartDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1, 'default' => '#NOW#'),~~ + 'StartDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), 'NewItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1,'default' => 2), 'PopItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1,'default' => 2), 'HotItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1,'default' => 2), 'Archived' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 2 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), ~~- 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),~~ + 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'ModifiedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => -1), 'OrgId' => Array('type' => 'int', 'default' => null), 'MetaKeywords' => Array('type' => 'string', 'default' => null),

Issue History
Date Modified	Username	Field	Change
2010-01-11 22:05	Dmitry	Note Added: 0001375
2010-01-11 22:05	Dmitry	Status	resolved => closed
2009-11-03 14:49	alex	Relationship added	related to 0000011
2009-11-03 14:48	alex	Changeset attached	5.0.x r12878
2009-10-20 03:17	alex	Note Added: 0000929
2009-10-20 03:17	alex	Status	reviewed and tested => resolved
2009-10-20 03:17	alex	Fixed in Version	=> 5.0.2
2009-10-20 03:17	alex	Resolution	open => fixed
2009-10-20 03:17	alex	Changeset attached	5.0.x r12703
2009-10-20 03:14	alex	Changeset attached	1.0.x r12702
2009-10-20 03:10	alex	Changeset attached	5.0.x r12701
2009-10-20 03:09	alex	Changeset attached	5.0.x r12700
2009-10-20 03:09	alex	Changeset attached	5.0.x r12699
2009-10-20 03:07	alex	Changeset attached	5.0.x r12698
2009-10-20 03:05	alex	Changeset attached	5.0.x r12697
2009-10-18 02:55	Dmitry	Note Added: 0000926
2009-10-18 02:55	Dmitry	Assigned To	!COMMUNITY => alex
2009-10-18 02:55	Dmitry	Status	needs testing => reviewed and tested
2009-10-10 10:21	alex	Note Added: 0000870
2009-10-10 10:21	alex	Assigned To	alex => !COMMUNITY
2009-10-10 10:21	alex	Status	needs work => needs testing
2009-10-10 10:19	alex	File Added: date+fields+made+null_v2.patch
2009-10-08 18:49	Dmitry	Note Added: 0000859
2009-10-08 18:49	Dmitry	Assigned To	!COMMUNITY => alex
2009-10-08 18:49	Dmitry	Status	needs testing => needs work
2009-10-04 08:10	alex	Time Estimate Removed	3 =>
2009-10-04 08:10	alex	Assigned To	alex => !COMMUNITY
2009-10-04 08:10	alex	Status	active => needs testing
2009-10-04 08:09	alex	File Added: date fields made null.patch
2009-10-03 07:52	administrator	Status	reviewed and tested => active
2009-09-30 06:59	alex	Assigned To	andrew => alex
2009-09-30 06:58	alex	Status	active => reviewed and tested
2009-09-30 06:58	alex	Assigned To	=> andrew
2009-09-23 13:24	alex	Time Estimate Added	3
2009-09-23 13:24	alex	Note Added: 0000535
2009-09-21 03:21	alex	Target Version	=> 5.0.2
2009-08-08 02:27	alex	New Issue

Notes
(0000535) alex (manager) 2009-09-23 13:24	Plan: 1. detect such field by usage of kDateFormatter in unit configs 2. made appropriate changes in database and install/upgrade scripts.

(0000859) Dmitry (manager) 2009-10-08 18:49	NEW INSTALLATION: 1. This is SQL syntax error within in-auction/install/install_schema.sql ================ ALTER TABLE Products ADD LastListingId INT(11) NOT NULL DEFAULT '0', ADD ScheduleId INT(11) NOT NULL DEFAULT '0'; ADD INDEX ( ScheduleId ); ================ UPGRADE - NOTE TESTED YET.

(0000870) alex (manager) 2009-10-10 10:21	Because of problem with products_config.php file (see 0000370) it wasn't included in first patch. Now all is ok, install/upgrade tested for no errors in sql at least. Needs to be tested, that admin console looks/works the same after clean install/upgrade.

(0000926) Dmitry (manager) 2009-10-18 02:55	Installation and Admin tested ok.

(0000929) alex (manager) 2009-10-20 03:17	Fix committed to 5.0.x branch. Commit Message: Fixes 0000211: Make all fields, that contain dates NULL with NULL default value

(0001375) Dmitry (manager) 2010-01-11 22:05	Closing completed tasks.

Related Changesets
Modules :: In-Commerce: 5.0.x r12878 Timestamp: 2009-11-03 14:47:17 Author: alex [ Details ] [ Diff ]	1. Bug 0000011: Installation Fails with MySQL in Strict mode 2. Unable to create new product in strict mode (clean install only), tells that PackageContent column could not be null.
	mod - /w/in-commerce/branches/5.0.x/in-commerce/install/install_schema.sql	[ Diff ] [ File ]

In-Portal CMS: 5.0.x r12703 Timestamp: 2009-10-20 03:17:55 Author: alex [ Details ] [ Diff ]	Fixes 0000211: Make all fields, that contain dates NULL with NULL default value
	mod - /in-portal/branches/5.0.x/core/install/install_schema.sql	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/install/upgrades.sql	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/categories/categories_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/categories/categories_tag_processor.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/email_queue/email_queue_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/files/files_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/form_fields/form_fields_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/form_submissions/form_submissions_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/logs/change_logs/change_logs_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/logs/email_logs/email_logs_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/logs/session_logs/session_logs_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/phrases/phrases_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/reviews/reviews_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/selectors/selectors_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/structure/structure_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/stylesheets/stylesheets_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/user_profile/user_profile_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/users/users_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/visits/visits_config.php	[ Diff ] [ File ]

Modules :: Custom: 1.0.x r12702 Timestamp: 2009-10-20 03:14:14 Author: alex [ Details ] [ Diff ]	Bug 0000211: Make all fields, that contain dates NULL with NULL default value
	mod - /custom/branches/1.0.x/custom/install/install_schema.sql	[ Diff ] [ File ]
	mod - /custom/branches/1.0.x/custom/install/upgrades.sql	[ Diff ] [ File ]
	mod - /custom/branches/1.0.x/custom/units/sections/sections_config.php	[ Diff ] [ File ]
	mod - /custom/branches/1.0.x/custom/units/widgets/widgets_config.php	[ Diff ] [ File ]

Modules :: In-Bulletin: 5.0.x r12700 Timestamp: 2009-10-20 03:09:54 Author: alex [ Details ] [ Diff ]	Bug 0000211: Make all fields, that contain dates NULL with NULL default value
	mod - /in-bulletin/branches/5.0.x/in-bulletin/install/install_schema.sql	[ Diff ] [ File ]
	mod - /in-bulletin/branches/5.0.x/in-bulletin/install/upgrades.sql	[ Diff ] [ File ]
	mod - /in-bulletin/branches/5.0.x/in-bulletin/units/poll_comments/poll_comments_config.php	[ Diff ] [ File ]
	mod - /in-bulletin/branches/5.0.x/in-bulletin/units/polls/polls_config.php	[ Diff ] [ File ]
	mod - /in-bulletin/branches/5.0.x/in-bulletin/units/posts/posts_config.php	[ Diff ] [ File ]
	mod - /in-bulletin/branches/5.0.x/in-bulletin/units/private_message_body/private_message_body_config.php	[ Diff ] [ File ]
	mod - /in-bulletin/branches/5.0.x/in-bulletin/units/private_messages/private_messages_config.php	[ Diff ] [ File ]
	mod - /in-bulletin/branches/5.0.x/in-bulletin/units/topics/topics_config.php	[ Diff ] [ File ]

Modules :: In-Commerce: 5.0.x r12699 Timestamp: 2009-10-20 03:09:13 Author: alex [ Details ] [ Diff ]	Bug 0000211: Make all fields, that contain dates NULL with NULL default value
	mod - /w/in-commerce/branches/5.0.x/in-commerce/install/install_schema.sql	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/install/upgrades.sql	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/affiliate_payment_types/affiliate_payment_types_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/affiliate_payments/affiliate_payments_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/affiliates/affiliates_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/coupon_items/coupon_items_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/coupons/coupons_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/currencies/currencies_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/discount_items/discount_items_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/downloads/downloads_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/files/files_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/gateways/gateways_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/manufacturers/manufacturers_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/orders/orders_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/payment_type/payment_type_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/product_option_combinations/product_option_combinations_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/products/products_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/shipping/shipping_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php	[ Diff ] [ File ]

Modules :: In-Link: 5.0.x r12698 Timestamp: 2009-10-20 03:07:00 Author: alex [ Details ] [ Diff ]	Bug 0000211: Make all fields, that contain dates NULL with NULL default value
	mod - /in-link/branches/5.0.x/in-link/install/install_schema.sql	[ Diff ] [ File ]
	mod - /in-link/branches/5.0.x/in-link/install/upgrades.sql	[ Diff ] [ File ]
	mod - /in-link/branches/5.0.x/in-link/units/l-visits/l-visits_config.php	[ Diff ] [ File ]
	mod - /in-link/branches/5.0.x/in-link/units/link_validation/link_validation_config.php	[ Diff ] [ File ]
	mod - /in-link/branches/5.0.x/in-link/units/listing_types/listing_types_config.php	[ Diff ] [ File ]

Modules :: In-News: 5.0.x r12697 Timestamp: 2009-10-20 03:05:00 Author: alex [ Details ] [ Diff ]	Bug 0000211: Make all fields, that contain dates NULL with NULL default value
	mod - /in-news/branches/5.0.x/in-news/install/install_schema.sql	[ Diff ] [ File ]
	mod - /in-news/branches/5.0.x/in-news/install/upgrades.sql	[ Diff ] [ File ]
	mod - /in-news/branches/5.0.x/in-news/units/articles/articles_config.php	[ Diff ] [ File ]

In-Portal Issue Tracker