From 04f8aabb07701d534d6cf28237e4bd8704c3ee7f Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Thu, 21 Apr 2011 17:25:17 +0200
Subject: update installer ..

---
 setup/pbs-newdata.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'setup/pbs-newdata.sql')

diff --git a/setup/pbs-newdata.sql b/setup/pbs-newdata.sql
index 00c9f96..43d2c41 100644
--- a/setup/pbs-newdata.sql
+++ b/setup/pbs-newdata.sql
@@ -1,4 +1,4 @@
-USE pbs;
+USE ##pbs##;
 SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 
 -- Adding person test2//test
-- 
cgit v1.2.3-55-g7522


From 9f5bdc99cfa6607afc00d5d9beadcf794af22abf Mon Sep 17 00:00:00 2001
From: Simon
Date: Thu, 21 Apr 2011 17:44:19 +0200
Subject: sql fix für datenbank-insert

---
 setup/pbs-newdata.sql | 18 +++++++++---------
 setup/pbs.sql         | 42 +++++++++++++++++++++---------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'setup/pbs-newdata.sql')

diff --git a/setup/pbs-newdata.sql b/setup/pbs-newdata.sql
index 43d2c41..ebe5d15 100644
--- a/setup/pbs-newdata.sql
+++ b/setup/pbs-newdata.sql
@@ -9,7 +9,7 @@ INSERT INTO `pbs_person` (`personID`, `title`, `name`, `firstname`, `street`, `h
 (3, 'Herr', 'Test 3', 'Test 3', 'Teststr,', '5', 'Testburg', '1337', NULL, '1299612370', 'test3', NULL, '4207acba08cadccc397e2302a55b339a', 'f21ee663b17bcefc6868694dffda602a');
 
 -- Adding group
-INSERT INTO `pbs`.`pbs_group` (`groupID` ,`title` ,`description`)VALUES 
+INSERT INTO `pbs_group` (`groupID` ,`title` ,`description`)VALUES 
 (2, 'Germany', 'Deutschland'), 
 (3, 'France', 'France'),
 (4, 'DFN', 'Deutsches Forschungsnetz'),
@@ -18,7 +18,7 @@ INSERT INTO `pbs`.`pbs_group` (`groupID` ,`title` ,`description`)VALUES
 (7, 'Bayern', 'Seventh Group'),
 (8, 'Uni-Freiburg', 'Eight Group');
 
-INSERT INTO `pbs`.`pbs_groupgroups` (`parentID`, `groupID`) VALUES 
+INSERT INTO `pbs_groupgroups` (`parentID`, `groupID`) VALUES 
 (1, 2),
 (1, 3),
 (2, 4),
@@ -28,13 +28,13 @@ INSERT INTO `pbs`.`pbs_groupgroups` (`parentID`, `groupID`) VALUES
 (6, 8);
 
 -- Adding memberships
-INSERT INTO `pbs`.`pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '2', '1', '1', 'apikey2');
-INSERT INTO `pbs`.`pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '3', '1', '1', 'apikey3');
-INSERT INTO `pbs`.`pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '4', '1', '1', 'apikey4');
-INSERT INTO `pbs`.`pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '5', '1', '1', 'apikey4');
-INSERT INTO `pbs`.`pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '6', '1', '1', 'apikey4');
-INSERT INTO `pbs`.`pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '7', '1', '1', 'apikey4');
-INSERT INTO `pbs`.`pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '8', '1', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '2', '1', '1', 'apikey2');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '3', '1', '1', 'apikey3');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '4', '1', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '5', '1', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '6', '1', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '7', '1', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '8', '1', '1', 'apikey4');
 
 -- Adding clients
 INSERT INTO `pbs_client` (`clientID`, `groupID`,`macadress`, `hardwarehash`) VALUES
diff --git a/setup/pbs.sql b/setup/pbs.sql
index d579ccf..39ef83c 100644
--- a/setup/pbs.sql
+++ b/setup/pbs.sql
@@ -394,7 +394,7 @@ INSERT INTO `pbs_rightcategory` (`rightcategoryID`, `title`) VALUES
 (12, 'Session');
 
 -- Insert rights
-INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES 
+INSERT INTO `pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES 
 	-- Person
 	-- Personenübersicht anzeigen
 (NULL, '1', 'pso', 'Show overview of persons', NULL),
@@ -608,49 +608,49 @@ INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`
 	-- Session Übersicht ansehen
 (NULL, '12', 'so', 'Show overview of Session', NULL);
 
-INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'geo', 'Edit own group', NULL);
-INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'ge', 'Edit other group', NULL);
-INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'glk', 'Link groups', NULL);
-INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'grog', 'Overview of own group requests', NULL);
-INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'grotg', 'Overview of other group requests', NULL);
-INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'gsmgo', 'Show members of own group', NULL);
+INSERT INTO `pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'geo', 'Edit own group', NULL);
+INSERT INTO `pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'ge', 'Edit other group', NULL);
+INSERT INTO `pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'glk', 'Link groups', NULL);
+INSERT INTO `pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'grog', 'Overview of own group requests', NULL);
+INSERT INTO `pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'grotg', 'Overview of other group requests', NULL);
+INSERT INTO `pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES (NULL, '2', 'gsmgo', 'Show members of own group', NULL);
 
 -- Adding Super-User
-INSERT INTO `pbs`.`pbs_group` (`groupID` ,`title` ,`description`)VALUES 
+INSERT INTO `pbs_group` (`groupID` ,`title` ,`description`)VALUES 
 (1, 'OpenSLX', 'This is the OpenSLX-Group');
-INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
+INSERT INTO `pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
 	(1, '1', 'SuperAdmin', 'The SuperAdmin', 0);
-INSERT INTO `pbs`.`pbs_rightroles` (`roleID`, `rightID`) VALUES
+INSERT INTO `pbs_rightroles` (`roleID`, `rightID`) VALUES
 (1, 1),(1, 2),(1, 3),(1, 4),(1, 5),(1, 6),(1, 7),(1, 8),(1, 9),(1, 10),(1, 11),(1, 12),(1, 13),(1, 14),(1, 15),(1, 16),(1, 17),(1, 18),(1, 19),(1, 20),(1, 21),(1, 22),(1, 23),(1, 24),(1, 25),(1, 26),(1, 27),(1, 28),(1, 29),(1, 30),(1, 31),(1, 32),(1, 33),(1, 34),(1, 35),(1, 36),(1, 37),(1, 38),(1, 39),(1, 40),(1, 41),(1, 42),(1, 43),(1, 44),(1, 45),(1, 46),(1, 47),(1, 48),(1, 49),(1, 50),(1, 51),(1, 52),(1, 53),(1, 54),(1, 55),(1, 56),(1, 57),(1, 58),(1, 59),(1, 60),(1, 61),(1, 62),(1, 63),(1, 64),(1, 65),(1, 66),(1, 67),(1, 68),(1, 69),(1, 70),(1, 71),(1, 72),(1, 73),(1, 74),(1, 75),(1, 76),(1, 77),(1, 78),(1, 79),(1, 80),(1, 81),(1, 82),(1, 83),(1, 84),(1, 85),(1, 86),(1, 87),(1, 88),(1, 89),(1, 90),(1, 91),(1, 92),(1, 93),(1, 94),(1, 95),(1, 96),(1, 97),(1, 98),(1, 99),(1, 100);
 
 -- Adding Community-Admin
-INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
+INSERT INTO `pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
 (2, 1, 'Community-Admin', 'This role can observe and edit all group, person and role specific details', 1);
-INSERT INTO `pbs`.`pbs_rightroles` (`roleID`, `rightID`) VALUES
+INSERT INTO `pbs_rightroles` (`roleID`, `rightID`) VALUES
 (2, 1),(2, 2),(2, 3),(2, 4),(2, 5),(2, 6),(2, 7),(2, 8),(2, 9),(2, 10),(2, 11),(2, 12),(2, 13),(2, 14),(2, 15),(2, 16),(2, 17),(2, 18),(2, 19),(2, 20),(2, 21),(2, 22),(2, 23),(2, 24),(2, 25),(2, 26),(2, 27),(2, 28),(2, 29),(2, 30),(2, 31),(2, 33),(2, 37),(2, 46),(2, 50),(2, 51),(2, 52),(2, 57),(2, 63),(2, 70),(2, 71),(2, 72),(2, 73),(2, 95),(2, 96),(2, 97),(2, 98),(2, 99),(2, 100);
 
 -- Adding Monitor-Admin
-INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
+INSERT INTO `pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
 (3, 1, 'Monitor-Admin', 'This role can monitor all details of the pbs-server', 1);
-INSERT INTO `pbs`.`pbs_rightroles` (`roleID`, `rightID`) VALUES
+INSERT INTO `pbs_rightroles` (`roleID`, `rightID`) VALUES
 (3, 1),(3, 9),(3, 10),(3, 11),(3, 12),(3, 16),(3, 23),(3, 25),(3, 32),(3, 39),(3, 45),(3, 50),(3, 51),(3, 52),(3, 56),(3, 62),(3, 71),(3, 72),(3, 73),(3, 75),(3, 79),(3, 86),(3, 94);
 
 -- Adding Default-Admin
-INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
+INSERT INTO `pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
 (4, 1, 'Admin', 'This role is the defautl Admin', 1);
-INSERT INTO `pbs`.`pbs_rightroles` (`roleID`, `rightID`) VALUES
+INSERT INTO `pbs_rightroles` (`roleID`, `rightID`) VALUES
 (4, 2),(4, 3),(4, 4),(4, 10),(4, 12),(4, 13),(4, 16),(4, 17),(4, 18),(4, 19),(4, 20),(4, 22),(4, 23),(4, 24),(4, 25),(4, 26),(4, 28),(4, 29),(4, 30),(4, 31),(4, 32),(4, 34),(4, 35),(4, 36),(4, 37),(4, 39),(4, 40),(4, 41),(4, 42),(4, 43),(4, 45),(4, 47),(4, 48),(4, 49),(4, 50),(4, 51),(4, 52),(4, 53),(4, 55),(4, 56),(4, 58),(4, 59),(4, 60),(4, 62),(4, 64),(4, 65),(4, 66),(4, 67),(4, 68),(4, 69),(4, 70),(4, 71),(4, 72),(4, 73),(4, 75),(4, 76),(4, 77),(4, 78),(4, 79),(4, 80),(4, 81),(4, 82),(4, 83),(4, 84),(4, 85),(4, 86),(4, 87),(4, 88),(4, 89),(4, 90),(4, 91),(4, 92),(4, 93),(4, 94);
 
 -- Adding Meta-Admin
-INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
+INSERT INTO `pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
 (5, 1, 'Meta-Admin', 'This role can edit all metadata from entrys', 1);
-INSERT INTO `pbs`.`pbs_rightroles` (`roleID`, `rightID`) VALUES
+INSERT INTO `pbs_rightroles` (`roleID`, `rightID`) VALUES
 (5, 1),(5, 2),(5, 3),(5, 4),(5, 32),(5, 38),(5, 39),(5, 44),(5, 45),(5, 50),(5, 51),(5, 52),(5, 54),(5, 55),(5, 61),(5, 62),(5, 71),(5, 72),(5, 73),(5, 74),(5, 75),(5, 86),(5, 89);
 
 -- Adding User
-INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
+INSERT INTO `pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES 
 (6, 1, 'User', 'The default user', 1);
-INSERT INTO `pbs`.`pbs_rightroles` (`roleID`, `rightID`) VALUES
+INSERT INTO `pbs_rightroles` (`roleID`, `rightID`) VALUES
 (6, 2),(6, 3),(6, 4),(6, 16),(6, 19),(6, 33),(6, 37),(6, 46),(6, 50),(6, 51),(6, 52),(6, 57),(6, 63),(6, 70),(6, 71),(6, 72);
 
 -- Adding a Person for SuperAdmin
@@ -658,4 +658,4 @@ INSERT INTO `pbs_person` (`personID`, `title`, `name`, `firstname`, `street`, `h
 (1, 'Herr', 'Super', 'Admin', 'Street', '1337', 'Teshouse', '1337', NULL, '1299612370', 'test', NULL, '4207acba08cadccc397e2302a55b339a', 'f21ee663b17bcefc6868694dffda602a');
 
 -- Get him a Membership in MainGroup for activate Requests
-INSERT INTO `pbs`.`pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '1', '1', '1', 'apikey1');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '1', '1', '1', 'apikey1');
-- 
cgit v1.2.3-55-g7522

