Author: jfthomps
Date: Wed Sep 28 19:43:20 2011
New Revision: 1177029
URL: http://svn.apache.org/viewvc?rev=1177029&view=rev
Log:
VCL-511
Errors in vcl.sql connectmethodmap
connectmethodmap:
-changed key from imageid to imagerevisionid
-changed constraint from imageid reference image.id to imagerevisionid
reference imagerevision.id
VCL-230
duplicate entries created in userpriv table
userpriv:
-removed usergroupid from unique userid key
-changed key for usergroupid to be unique and to be on usergroupid, privnodeid,
userprivtypeid
Modified:
incubator/vcl/trunk/mysql/vcl.sql
Modified: incubator/vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/vcl.sql?rev=1177029&r1=1177028&r2=1177029&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/vcl.sql (original)
+++ incubator/vcl/trunk/mysql/vcl.sql Wed Sep 28 19:43:20 2011
@@ -318,7 +318,7 @@ CREATE TABLE IF NOT EXISTS `connectmetho
KEY `connectmethodid` (`connectmethodid`),
KEY `OStypeid` (`OStypeid`),
KEY `OSid` (`OSid`),
- KEY `imageid` (`imageid`)
+ KEY `imagerevisionid` (`imagerevisionid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1123,9 +1123,9 @@ CREATE TABLE IF NOT EXISTS `userpriv` (
`privnodeid` mediumint(8) unsigned NOT NULL default '0',
`userprivtypeid` smallint(5) unsigned NOT NULL default '0',
PRIMARY KEY (`id`,`privnodeid`,`userprivtypeid`),
- UNIQUE KEY `userid` (`userid`,`usergroupid`,`privnodeid`,`userprivtypeid`),
+ UNIQUE KEY `userid` (`userid`,`privnodeid`,`userprivtypeid`),
+ UNIQUE KEY `usergroupid` (`usergroupid`,`privnodeid`,`userprivtypeid`),
KEY `privnodeid` (`privnodeid`),
- KEY `usergroupid` (`usergroupid`),
KEY `userprivtypeid` (`userprivtypeid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -1867,7 +1867,7 @@ ALTER TABLE `connectmethodmap`
ADD CONSTRAINT `connectmethodmap_ibfk_1` FOREIGN KEY (`connectmethodid`)
REFERENCES `connectmethod` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
ADD CONSTRAINT `connectmethodmap_ibfk_2` FOREIGN KEY (`OStypeid`) REFERENCES
`OStype` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
ADD CONSTRAINT `connectmethodmap_ibfk_3` FOREIGN KEY (`OSid`) REFERENCES
`OS` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
- ADD CONSTRAINT `connectmethodmap_ibfk_4` FOREIGN KEY (`imageid`) REFERENCES
`image` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ ADD CONSTRAINT `connectmethodmap_ibfk_4` FOREIGN KEY (`imagerevisionid`)
REFERENCES `imagerevision` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
--
-- Constraints for table `continuations`
