summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--setup/poolctrl.sql5
-rw-r--r--setup/poolctrl_data.sql16
2 files changed, 10 insertions, 11 deletions
diff --git a/setup/poolctrl.sql b/setup/poolctrl.sql
index 7581830..eaecfa0 100644
--- a/setup/poolctrl.sql
+++ b/setup/poolctrl.sql
@@ -110,7 +110,6 @@ CREATE TABLE IF NOT EXISTS `pbs_membership` (
`apikey` varchar(30),
PRIMARY KEY (`membershipID`),
KEY `groupID` (`groupID`),
- KEY `roleID` (`roleID`),
KEY `personID` (`personID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
@@ -163,8 +162,8 @@ ALTER TABLE `pbs_client`
ALTER TABLE `pbs_poolentries`
ADD CONSTRAINT `pbs_poolentries_ibfk_1` FOREIGN KEY (`poolID`) REFERENCES `pbs_pool` (`poolID`) ON DELETE CASCADE;
-ALTER TABLE `pbs_eventreport`
- ADD CONSTRAINT `pbs_eventreport_eventidC` FOREIGN KEY (`evenID`) REFERENCES `pbs_event` (`eventID`) ON DELETE CASCADE;
+ALTER TABLE `poolctrl_eventreport`
+ ADD CONSTRAINT `pbs_eventreport_eventidC` FOREIGN KEY (`eventID`) REFERENCES `poolctrl_event` (`eventID`) ON DELETE CASCADE;
ALTER TABLE `poolctrl_event`
ADD CONSTRAINT `poolctrl_event_poolidC` FOREIGN KEY (`pbs_poolID`) REFERENCES `pbs_pool` (`poolID`) ON DELETE CASCADE,
diff --git a/setup/poolctrl_data.sql b/setup/poolctrl_data.sql
index 1691953..795a17c 100644
--- a/setup/poolctrl_data.sql
+++ b/setup/poolctrl_data.sql
@@ -35,14 +35,14 @@ INSERT INTO `pbs_groupgroups` (`parentID`, `groupID`) VALUES
(6, 8);
-- Adding memberships
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '1', '1', '1', 'apikey1');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '2', '1', '1', 'apikey2');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '3', '1', '1', 'apikey3');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '4', '1', '1', 'apikey4');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '5', '1', '1', 'apikey4');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '6', '1', '1', 'apikey4');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '7', '1', '1', 'apikey4');
-INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '8', '1', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '1', '1', 'apikey1');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '2', '1', 'apikey2');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '3', '1', 'apikey3');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '4', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '5', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '6', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '7', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `personID`, `apikey`) VALUES (NULL, '8', '1', 'apikey4');
-- Adding clients
INSERT INTO `pbs_client` (`clientID`, `groupID`,`macadress`, `hardwarehash`) VALUES