Author: arkurth
Date: Wed Mar 12 16:59:07 2014
New Revision: 1576819
URL: http://svn.apache.org/r1576819
Log:
VCL-753
Added changelog.reservationid and changelog.userid columns to vcl.sql and
update-vcl.sql.
VCL-560
Fixed typo in update-vcl.sql regarding the vmprofile table.
Other
Added reservation.imageid and reservation.imagerevisionid constraints to
reservation table.
Modified:
vcl/trunk/mysql/update-vcl.sql
vcl/trunk/mysql/vcl.sql
Modified: vcl/trunk/mysql/update-vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/update-vcl.sql?rev=1576819&r1=1576818&r2=1576819&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Wed Mar 12 16:59:07 2014
@@ -585,7 +585,11 @@ CALL AddColumnIfNotExists('blockTimes',
-- Table structure for table `changelog`
--
-CALL AddColumnIfNotExists('changelog', 'other', "varchar(255) default NULL");
+CALL AddColumnIfNotExists('changelog', 'userid', "mediumint(8) unsigned
default NULL AFTER `logid`");
+CALL AddColumnIfNotExists('changelog', 'reservationid', "mediumint(8) unsigned
default NULL AFTER `userid`");
+CALL AddColumnIfNotExists('changelog', 'other', "varchar(255) default NULL
AFTER `timestamp`");
+CALL AddIndexIfNotExists('changelog', 'userid');
+CALL AddIndexIfNotExists('changelog', 'reservationid');
-- --------------------------------------------------------
@@ -978,8 +982,8 @@ CALL AddColumnIfNotExists('vmprofile', '
CALL AddColumnIfNotExists('vmprofile', 'virtualswitch2', "varchar(80) NULL
default NULL AFTER `virtualswitch1`");
CALL AddColumnIfNotExists('vmprofile', 'virtualswitch3', "varchar(80) NULL
default NULL AFTER `virtualswitch2`");
CALL AddColumnIfNotExists('vmprofile', 'rsapub', "text NULL default NULL AFTER
`virtualswitch3`");
-CALL AddColumnIfNotExists('vmprofile', 'rsakey', "varchar(256) NULL default
NULL AFTER `rsa_pub`");
-CALL AddColumnIfNotExists('vmprofile', 'encryptedpasswd', "text NULL default
NULL AFTER `rsa_key`");
+CALL AddColumnIfNotExists('vmprofile', 'rsakey', "varchar(256) NULL default
NULL AFTER `rsapub`");
+CALL AddColumnIfNotExists('vmprofile', 'encryptedpasswd', "text NULL default
NULL AFTER `rsakey`");
CALL AddOrRenameColumn('vmprofile', 'vmware_mac_eth0_generated',
'eth0generated', "tinyint(1) unsigned NOT NULL default '0'");
CALL AddOrRenameColumn('vmprofile', 'vmware_mac_eth1_generated',
'eth1generated', "tinyint(1) unsigned NOT NULL default '0'");
@@ -1341,6 +1345,15 @@ CALL AddConstraintIfNotExists('provision
-- --------------------------------------------------------
--
+-- Constraints for table `reservation`
+--
+
+CALL AddConstraintIfNotExists('reservation', 'imageid', 'image', 'id',
'restrict', 'CASCADE');
+CALL AddConstraintIfNotExists('reservation', 'imagerevisionid',
'imagerevision', 'id', 'restrict', 'CASCADE');
+
+-- --------------------------------------------------------
+
+--
-- Constraints for table `reservationaccounts`
--
Modified: vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/vcl.sql?rev=1576819&r1=1576818&r2=1576819&view=diff
==============================================================================
--- vcl/trunk/mysql/vcl.sql (original)
+++ vcl/trunk/mysql/vcl.sql Wed Mar 12 16:59:07 2014
@@ -156,6 +156,8 @@ CREATE TABLE IF NOT EXISTS `blockWebTime
CREATE TABLE IF NOT EXISTS `changelog` (
`id` int(10) unsigned NOT NULL auto_increment,
`logid` int(10) unsigned NOT NULL default '0',
+ `userid` mediumint(8) unsigned DEFAULT NULL,
+ `reservationid` mediumint(8) unsigned default NULL,
`start` datetime default NULL,
`end` datetime default NULL,
`computerid` smallint(5) unsigned default NULL,
@@ -164,7 +166,9 @@ CREATE TABLE IF NOT EXISTS `changelog` (
`timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
`other` varchar(255) default NULL,
PRIMARY KEY (`id`),
- KEY `logid` (`logid`)
+ KEY `logid` (`logid`),
+ KEY `userid` (`userid`),
+ KEY `reservationid` (`reservationid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -2072,7 +2076,9 @@ ALTER TABLE `request`
ALTER TABLE `reservation`
ADD CONSTRAINT `reservation_ibfk_11` FOREIGN KEY (`requestid`) REFERENCES
`request` (`id`) ON DELETE CASCADE,
ADD CONSTRAINT `reservation_ibfk_10` FOREIGN KEY (`managementnodeid`)
REFERENCES `managementnode` (`id`),
- ADD CONSTRAINT `reservation_ibfk_9` FOREIGN KEY (`computerid`) REFERENCES
`computer` (`id`) ON UPDATE CASCADE;
+ ADD CONSTRAINT `reservation_ibfk_9` FOREIGN KEY (`computerid`) REFERENCES
`computer` (`id`) ON UPDATE CASCADE,
+ ADD CONSTRAINT reservation_ibfk_13 FOREIGN KEY (imagerevisionid) REFERENCES
imagerevision (id) ON UPDATE CASCADE,
+ ADD CONSTRAINT reservation_ibfk_12 FOREIGN KEY (imageid) REFERENCES image
(id) ON UPDATE CASCADE;
--
-- Constraints for table `reservationaccounts`
