diff --git a/sql/database-create.sql b/sql/database-create.sql index 1bc3f85be733ce9aafec09a2d7140abfddffd271..0272963da35742642476cf4aa3ac1cbb890509c0 100644 --- a/sql/database-create.sql +++ b/sql/database-create.sql @@ -238,6 +238,8 @@ CREATE TABLE `apt_instances` ( `extension_history` mediumtext, `extension_adminonly` tinyint(1) NOT NULL default '0', `extension_requested` tinyint(1) NOT NULL default '0', + `extension_denied` tinyint(1) NOT NULL default '0', + `extension_denied_reason` mediumtext, `extension_count` smallint(5) unsigned NOT NULL default '0', `extension_days` smallint(5) unsigned NOT NULL default '0', `physnode_count` smallint(5) unsigned NOT NULL default '0', @@ -2662,6 +2664,7 @@ CREATE TABLE `login` ( `timeout` varchar(10) NOT NULL default '', `adminon` tinyint(1) NOT NULL default '0', `opskey` varchar(64) NOT NULL, + `portal` enum('emulab','aptlab','cloudlab','phantomnet') NOT NULL default 'emulab', PRIMARY KEY (`uid_idx`,`hashkey`), UNIQUE KEY `hashhash` (`uid_idx`,`hashhash`), UNIQUE KEY `uidkey` (`uid`,`hashkey`) diff --git a/sql/updates/4/504 b/sql/updates/4/504 new file mode 100644 index 0000000000000000000000000000000000000000..3330067f1f849ed48b220be274aa57a35016bafc --- /dev/null +++ b/sql/updates/4/504 @@ -0,0 +1,33 @@ +# +# +# +use strict; +use libdb; + +sub DoUpdate($$$) +{ + my ($dbhandle, $dbname, $version) = @_; + + if (!DBSlotExists("apt_instances", "extension_denied")) { + DBQueryFatal("alter table apt_instances add ". + " `extension_denied` tinyint(1) NOT NULL default '0' ". + "after extension_requested"); + } + if (!DBSlotExists("apt_instances", "extension_denied_reason")) { + DBQueryFatal("alter table apt_instances add ". + " `extension_denied_reason` mediumtext ". + "after extension_denied"); + } + if (!DBSlotExists("login", "portal")) { + DBQueryFatal("alter table login add ". + " `portal` enum('emulab','aptlab','cloudlab', ". + " 'phantomnet') NOT NULL default 'emulab' ". + "after opskey"); + } + return 0; +} +1; + +# Local Variables: +# mode:perl +# End: