Merge branch 'innodb' of github.com:plainblack/webgui into innodb

This commit is contained in:
JT Smith 2009-10-16 08:34:01 -05:00
commit f0531eb912

View file

@ -1362,7 +1362,8 @@ CREATE TABLE `TT_projectList_inno` (
CREATE TABLE `TT_projectResourceList_inno` (
`projectId` char(22) character set utf8 collate utf8_bin NOT NULL,
`resourceId` char(22) character set utf8 collate utf8_bin NOT NULL,
PRIMARY KEY (`projectId`,`resourceId`)
PRIMARY KEY (`projectId`,`resourceId`),
KEY (`resourceId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@ -1375,7 +1376,6 @@ CREATE TABLE `TT_projectTasks_inno` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `TT_report_inno` (
`reportId` char(22) character set utf8 collate utf8_bin NOT NULL,
`assetId` char(22) character set utf8 collate utf8_bin NOT NULL,
@ -1386,7 +1386,8 @@ CREATE TABLE `TT_report_inno` (
`creationDate` bigint(20) NOT NULL,
`createdBy` char(22) character set utf8 collate utf8_bin,
`lastUpdatedBy` char(22) character set utf8 collate utf8_bin,
`lastUpdateDate` bigint(20) NOT NULL
`lastUpdateDate` bigint(20) NOT NULL,
PRIMARY KEY (reportId)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@ -1660,7 +1661,7 @@ CREATE TABLE `WorkflowActivityData_inno` (
CREATE TABLE `WorkflowInstance_inno` (
`instanceId` char(22) character set utf8 collate utf8_bin NOT NULL,
`workflowId` char(22) character set utf8 collate utf8_bin NOT NULL,
`currentActivityId` char(22) character set utf8 collate utf8_bin NOT NULL,
`currentActivityId` char(22) character set utf8 collate utf8_bin,
`priority` int(11) NOT NULL default '2',
`className` char(255) default NULL,
`methodName` char(255) default NULL,
@ -3565,9 +3566,8 @@ alter table TT_projectList add foreign key (createdBy) references users(userId)
alter table TT_projectList add foreign key (lastUpdatedBy) references users(userId) on delete set null on update cascade;
alter table TT_timeEntry add foreign key (projectId) references TT_projectList(projectId) on delete cascade on update cascade;
alter table TT_timeEntry add foreign key (taskId) references TT_projectTasks(taskId) on delete cascade on update cascade;
-- Not sure why this won't create
-- alter table TT_timeEntry add foreign key (reportId) references TT_report(reportId) on delete cascade on update cascade;
-- alter table TT_report add foreign key (resourceId) references TT_projectResourceList(resourceId) on delete cascade on update cascade;
alter table TT_timeEntry add foreign key (reportId) references TT_report(reportId) on delete cascade on update cascade;
alter table TT_report add foreign key (resourceId) references TT_projectResourceList(resourceId) on delete cascade on update cascade;
alter table TT_projectResourceList add foreign key (projectId) references TT_projectList(projectId) on delete cascade on update cascade;
alter table TT_projectTasks add foreign key (projectId) references TT_projectList(projectId) on delete cascade on update cascade;
alter table SyndicatedContent add foreign key (assetId,revisionDate) references wobject(assetId,revisionDate) on delete cascade on update cascade;
@ -3662,8 +3662,7 @@ alter table transactionItem add foreign key (transactionId) references transacti
alter table WorkflowActivityData add foreign key (activityId) references WorkflowActivity(activityId) on delete cascade on update cascade;
alter table WorkflowActivity add foreign key (workflowId) references Workflow(workflowId) on delete cascade on update cascade;
alter table WorkflowInstance add foreign key (workflowId) references Workflow(workflowId) on delete cascade on update cascade;
-- not sure why this doesn't work
-- alter table WorkflowInstance add foreign key (currentActivityId) references WorkflowActivity(activityId) on delete set null on update cascade;
alter table WorkflowInstance add foreign key (currentActivityId) references WorkflowActivity(activityId) on delete set null on update cascade;
alter table WorkflowInstanceScratch add foreign key (instanceId) references WorkflowInstance(instanceId) on delete cascade on update cascade;
alter table WorkflowSchedule add foreign key (workflowId) references Workflow(workflowId) on delete cascade on update cascade;
alter table adSkuPurchase add foreign key (transactionItemId) references transactionItem(itemId) on delete cascade on update cascade;