summaryrefslogtreecommitdiffstats
path: root/setup
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-08 14:19:49 +0200
committerBjörn Geiger2011-08-08 14:19:49 +0200
commit03196d75957c26e96e940420bc67c97eb9453bb7 (patch)
tree32f28d13dc98316b9fc8452eadf8023cd58f979c /setup
parentkleinen Fehler korrigiert (diff)
downloadpoolctrl-03196d75957c26e96e940420bc67c97eb9453bb7.tar.gz
poolctrl-03196d75957c26e96e940420bc67c97eb9453bb7.tar.xz
poolctrl-03196d75957c26e96e940420bc67c97eb9453bb7.zip
Membership aus der Poolctrl Datenbank entfernt
Diffstat (limited to 'setup')
-rw-r--r--setup/poolctrl.sql30
-rw-r--r--setup/poolctrl_data.sql10
2 files changed, 5 insertions, 35 deletions
diff --git a/setup/poolctrl.sql b/setup/poolctrl.sql
index 4a9b510..c00db75 100644
--- a/setup/poolctrl.sql
+++ b/setup/poolctrl.sql
@@ -49,8 +49,7 @@ CREATE TABLE IF NOT EXISTS `pbs_filter` (
`description` varchar(140),
`created` varchar(14) NOT NULL,
`priority` int(11) NOT NULL,
- PRIMARY KEY (`filterID`),
- KEY `membershipID` (`membershipID`),
+ PRIMARY KEY (`filterID`)
KEY `bootmenuID` (`bootmenuID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
@@ -61,8 +60,7 @@ CREATE TABLE IF NOT EXISTS `pbs_bootmenu` (
`title` varchar(50) NOT NULL,
`created` varchar(14) NOT NULL,
`defaultbootmenu` tinyint(1) NOT NULL DEFAULT '0',
- PRIMARY KEY (`bootmenuID`),
- KEY `membershipID` (`membershipID`)
+ PRIMARY KEY (`bootmenuID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
CREATE TABLE IF NOT EXISTS `pbs_bootos` (
@@ -80,8 +78,7 @@ CREATE TABLE IF NOT EXISTS `pbs_bootos` (
`created` VARCHAR(14) NOT NULL,
`expires` VARCHAR(14),
`public` int(11) NOT NULL DEFAULT '-1',
- PRIMARY KEY (`bootosID`),
- KEY `membershipID` (`membershipID`)
+ PRIMARY KEY (`bootosID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
CREATE TABLE IF NOT EXISTS `pbs_config` (
@@ -94,20 +91,9 @@ CREATE TABLE IF NOT EXISTS `pbs_config` (
`created` VARCHAR(14) NOT NULL,
`bootosID` int(11) NOT NULL,
PRIMARY KEY (`configID`),
- KEY `membershipID` (`membershipID`),
KEY `bootosID` (`bootosID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-CREATE TABLE IF NOT EXISTS `pbs_membership` (
- `membershipID` int(11) NOT NULL AUTO_INCREMENT,
- `groupID` int(11) NOT NULL,
- `personID` int(11) NOT NULL,
- `roleID` int(11) NOT NULL,
- `suspend` tinyint(1) NOT NULL,
- `apikey` varchar(30),
- PRIMARY KEY (`membershipID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-
CREATE TABLE IF NOT EXISTS `pbs_pool` (
`poolID` int(11) NOT NULL AUTO_INCREMENT,
`groupID` int(11) NOT NULL,
@@ -141,18 +127,13 @@ CREATE TABLE IF NOT EXISTS `pbs_passwordrecovery` (
-- Constraints
ALTER TABLE `pbs_filter`
- ADD CONSTRAINT `pbs_filter_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`),
- ADD CONSTRAINT `pbs_filter_ibfk_3` FOREIGN KEY (`bootmenuID`) REFERENCES `pbs_bootmenu` (`bootmenuID`) ON DELETE CASCADE;
+ ADD CONSTRAINT `pbs_filter_ibfk` FOREIGN KEY (`bootmenuID`) REFERENCES `pbs_bootmenu` (`bootmenuID`) ON DELETE CASCADE;
ALTER TABLE `pbs_bootmenu` ADD `startcounter` INT NOT NULL AFTER `title`;
ALTER TABLE `pbs_bootmenu` CHANGE `startcounter` `startcounter` INT( 11 ) NOT NULL DEFAULT '300';
ALTER TABLE `pbs_config`
- ADD CONSTRAINT `pbs_config_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE CASCADE,
- ADD CONSTRAINT `pbs_config_ibfk_3` FOREIGN KEY (`bootosID`) REFERENCES `pbs_bootos` (`bootosID`) ON DELETE CASCADE;
-
-ALTER TABLE `pbs_bootos`
- ADD CONSTRAINT `pbs_bootos_ibfk_3` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL;
+ ADD CONSTRAINT `pbs_config_ibfk` FOREIGN KEY (`bootosID`) REFERENCES `pbs_bootos` (`bootosID`) ON DELETE CASCADE;
ALTER TABLE `pbs_poolentries`
ADD CONSTRAINT `pbs_poolentries_ibfk_1` FOREIGN KEY (`poolID`) REFERENCES `pbs_pool` (`poolID`) ON DELETE CASCADE;
@@ -162,7 +143,6 @@ ALTER TABLE `poolctrl_eventreport`
ALTER TABLE `poolctrl_event`
ADD CONSTRAINT `poolctrl_event_poolidC` FOREIGN KEY (`pbs_poolID`) REFERENCES `pbs_pool` (`poolID`) ON DELETE CASCADE,
- ADD CONSTRAINT `poolctrl_event_membershipC` FOREIGN KEY (`pbs_membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE CASCADE,
ADD CONSTRAINT `poolctrl_event_bootosidC` FOREIGN KEY (`pbs_bootosID`) REFERENCES `pbs_bootos` (`bootosID`) ON DELETE CASCADE,
-- ADD CONSTRAINT `poolctrl_event_bootmenuidC` FOREIGN KEY (`pbs_bootmenuID`) REFERENCES `pbs_bootmenu` (`bootmenuID`) ON DELETE CASCADE,
-- ADD CONSTRAINT `poolctrl_event_filteridC` FOREIGN KEY (`pbs_filterID`) REFERENCES `pbs_filter` (`filterID`) ON DELETE CASCADE,
diff --git a/setup/poolctrl_data.sql b/setup/poolctrl_data.sql
index 64e3653..e3d9b4c 100644
--- a/setup/poolctrl_data.sql
+++ b/setup/poolctrl_data.sql
@@ -1,16 +1,6 @@
USE ##poolctrl##;
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
--- Adding memberships
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `roleID`, `apikey`) VALUES (NULL, '1', '1', '1', 'apikey1');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `roleID`, `apikey`) VALUES (NULL, '2', '1', '1', 'apikey2');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `roleID`, `apikey`) VALUES (NULL, '3', '1', '1', 'apikey3');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `roleID`, `apikey`) VALUES (NULL, '4', '1', '1', 'apikey4');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `roleID`, `apikey`) VALUES (NULL, '5', '1', '1', 'apikey4');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `roleID`, `apikey`) VALUES (NULL, '6', '1', '1', 'apikey4');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `roleID`, `apikey`) VALUES (NULL, '7', '1', '1', 'apikey4');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `roleID`, `apikey`) VALUES (NULL, '8', '1', '1', 'apikey4');
-
-- Adding clients
INSERT INTO `pbs_client` (`clientID`, `groupID`,`macadress`, `hardwarehash`) VALUES
(1, 1, 'a5:9a:0f:94:2a:b0', 'ea9b82d9de911bc2d3cd23f53a6cab48'),