summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon2011-03-10 15:48:11 +0100
committerSimon2011-03-10 15:48:11 +0100
commitd48d3bc5f327d83b3a3559fe74d58cb32edbee69 (patch)
tree6cf2e59262e35c70ab51a25df8e42772f7c4d951
parenttemplate angepasst (diff)
parentausversehen gelöschtes wiederhergestellt (diff)
downloadpbs2-d48d3bc5f327d83b3a3559fe74d58cb32edbee69.tar.gz
pbs2-d48d3bc5f327d83b3a3559fe74d58cb32edbee69.tar.xz
pbs2-d48d3bc5f327d83b3a3559fe74d58cb32edbee69.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
-rw-r--r--pbs.sql8
1 files changed, 6 insertions, 2 deletions
diff --git a/pbs.sql b/pbs.sql
index f404b0a..f762115 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -33,6 +33,7 @@ ALTER TABLE `pbs_role`
CREATE TABLE IF NOT EXISTS `pbs_rightroles` (
`roleID` int(11) NOT NULL,
`rightID` int(11) NOT NULL,
+ PRIMARY KEY (`roleID`,`rightID`),
KEY `roleID` (`roleID`),
KEY `rightID` (`rightID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
@@ -45,6 +46,7 @@ ALTER TABLE `pbs_rightroles`
CREATE TABLE IF NOT EXISTS `pbs_groupgroups` (
`parentID` int(11) NOT NULL,
`groupID` int(11) NOT NULL,
+ PRIMARY KEY (`parentID`,`groupID`),
KEY `parentID` (`parentID`),
KEY `groupID` (`groupID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
@@ -231,6 +233,7 @@ CREATE TABLE IF NOT EXISTS `pbs_pool` (
CREATE TABLE IF NOT EXISTS `pbs_poolentries` (
`poolID` int(11) NOT NULL,
`clientID` int(11) NOT NULL,
+ PRIMARY KEY (`poolID`,`clientID`),
KEY `poolID` (`poolID`),
KEY `clientID` (`clientID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
@@ -263,6 +266,7 @@ ALTER TABLE `pbs_filter`
CREATE TABLE IF NOT EXISTS `pbs_membershipfilters` (
`membershipID` int(11) NOT NULL,
`filterID` int(11) NOT NULL,
+ PRIMARY KEY (`membershipID`,`filterID`),
KEY `membershipID` (`membershipID`),
KEY `filterID` (`filterID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
@@ -274,6 +278,7 @@ ALTER TABLE `pbs_membershipfilters`
CREATE TABLE IF NOT EXISTS `pbs_poolfilters` (
`poolID` int(11) NOT NULL,
`filterID` int(11) NOT NULL,
+ PRIMARY KEY (`poolID`,`filterID`),
KEY `poolID` (`poolID`),
KEY `filterID` (`filterID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
@@ -293,6 +298,7 @@ CREATE TABLE IF NOT EXISTS `pbs_filterentries` (
`filtertypeID` int(11) NOT NULL,
`filtervalue` varchar(140) NOT NULL,
`filtervalue2` varchar(140) NOT NULL,
+ PRIMARY KEY (`filterID`,`filtertypeID`),
KEY `filterID` (`filterID`),
KEY `filtertypeID` (`filtertypeID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
@@ -302,7 +308,6 @@ ALTER TABLE `pbs_filterentries`
ADD CONSTRAINT `pbs_filterentries_ibfk_1` FOREIGN KEY (`filterID`) REFERENCES `pbs_filter` (`filterID`) ON DELETE CASCADE,
ADD CONSTRAINT `pbs_filterentries_ibfk_2` FOREIGN KEY (`filtertypeID`) REFERENCES `pbs_filtertype` (`filtertypeID`) ON DELETE CASCADE;
-
-- Insert Filtertypes
INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'IP');
INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'MAC');
@@ -313,4 +318,3 @@ INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NU
INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Time');
INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Client');
-