db fix

2 files changed, 34 insertions, 36 deletions

diff --git a/setup/pbs-newdata.sql b/setup/pbs-newdata.sql
index a290008..f611161 100644
--- a/setup/pbs-newdata.sql
+++ b/setup/pbs-newdata.sql
@@ -1,9 +1,6 @@
 USE pbs;
 SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 
--- Adding person test//test
-INSERT INTO `pbs_person` (`personID`, `title`, `name`, `firstname`, `street`, `housenumber`, `city`, `postalcode`, `logindate`, `registerdate`, `email`, `login`, `password`, `password_salt`) VALUES
-(1, 'Herr', 'Test 1', 'Test 1', 'Teststr,', '5', 'Testburg', '1337', NULL, '1299612370', 'test', NULL, '4207acba08cadccc397e2302a55b339a', 'f21ee663b17bcefc6868694dffda602a');
 -- Adding person test2//test
 INSERT INTO `pbs_person` (`personID`, `title`, `name`, `firstname`, `street`, `housenumber`, `city`, `postalcode`, `logindate`, `registerdate`, `email`, `login`, `password`, `password_salt`) VALUES
 (2, 'Herr', 'Test 2', 'Test 2', 'Teststr,', '5', 'Testburg', '1337', NULL, '1299612370', 'test2', NULL, '4207acba08cadccc397e2302a55b339a', 'f21ee663b17bcefc6868694dffda602a');
diff --git a/setup/pbs.sql b/setup/pbs.sql
index 0084a34..ad1a41f 100644
--- a/setup/pbs.sql
+++ b/setup/pbs.sql
@@ -116,8 +116,37 @@ ALTER TABLE `pbs_membership`
   ADD CONSTRAINT `pbs_membership_ibfk_1` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE,
   ADD CONSTRAINT `pbs_membership_ibfk_2` FOREIGN KEY (`personID`) REFERENCES `pbs_person` (`personID`) ON DELETE CASCADE,
   ADD CONSTRAINT `pbs_membership_ibfk_3` FOREIGN KEY (`roleID`) REFERENCES `pbs_role` (`roleID`) ON DELETE CASCADE;
+  
+CREATE TABLE IF NOT EXISTS `pbs_hometype` (
+  `hometypeID` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(30) NOT NULL,
+  PRIMARY KEY (`hometypeID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1;
+
+CREATE TABLE IF NOT EXISTS `pbs_bootos` (
+  `bootosID` int(11) NOT NULL AUTO_INCREMENT,
+  `groupID` int(11) NOT NULL,
+  `membershipID` int(11),
+  `title` varchar(30) NOT NULL,
+  `description` varchar(140),
+  `distro` varchar(30),
+  `distroversion` varchar(30),
+  `source` varchar(140),
+  `share` varchar(30),
+  `shortname` varchar(30),
+  `defaultkcl` varchar(255),
+  `created` VARCHAR(14) NOT NULL,
+  `expires` VARCHAR(14),
+  `public` int(11) NOT NULL DEFAULT '-1',
+  PRIMARY KEY (`bootosID`),
+  KEY `groupID` (`groupID`),
+  KEY `membershipID` (`membershipID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
+ALTER TABLE `pbs_bootos`
+  ADD CONSTRAINT `pbs_bootos_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE,
+  ADD CONSTRAINT `pbs_bootos_ibfk_3` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL;
 
-CREATE TABLE IF NOT EXISTS `pbs_config` (
+ CREATE TABLE IF NOT EXISTS `pbs_config` (
   `configID` int(11) NOT NULL AUTO_INCREMENT,
   `title` varchar(30) NOT NULL,
   `description` varchar(140),
@@ -135,15 +164,10 @@ CREATE TABLE IF NOT EXISTS `pbs_config` (
 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_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE,
-  ADD CONSTRAINT `pbs_config_ibfk_3` FOREIGN KEY (`bootosID`) REFERENCES `pbs_bootos` (`bootosID`) ON DELETE CASCADE;
+  ADD CONSTRAINT `pbs_config_ibfk_3` FOREIGN KEY (`bootosID`) REFERENCES `pbs_bootos` (`bootosID`) ON DELETE CASCADE; 
   
-CREATE TABLE IF NOT EXISTS `pbs_hometype` (
-  `hometypeID` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(30) NOT NULL,
-  PRIMARY KEY (`hometypeID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1;
   
-CREATE TABLE IF NOT EXISTS `pbs_bootosuser` (
+ CREATE TABLE IF NOT EXISTS `pbs_bootosuser` (
   `bootosuserID` int(11) NOT NULL AUTO_INCREMENT,
   `configID` int(11) NOT NULL,
   `login` varchar(30) NOT NULL,
@@ -156,31 +180,8 @@ CREATE TABLE IF NOT EXISTS `pbs_bootosuser` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
 
 ALTER TABLE `pbs_bootosuser`
-  ADD CONSTRAINT `pbs_bootosuser_ibfk_1` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`) ON DELETE CASCADE;
-
-CREATE TABLE IF NOT EXISTS `pbs_bootos` (
-  `bootosID` int(11) NOT NULL AUTO_INCREMENT,
-  `groupID` int(11) NOT NULL,
-  `membershipID` int(11),
-  `title` varchar(30) NOT NULL,
-  `description` varchar(140),
-  `distro` varchar(30),
-  `distroversion` varchar(30),
-  `source` varchar(140),
-  `share` varchar(30),
-  `shortname` varchar(30),
-  `defaultkcl` varchar(255),
-  `created` VARCHAR(14) NOT NULL,
-  `expires` VARCHAR(14),
-  `public` int(11) NOT NULL DEFAULT '-1',
-  PRIMARY KEY (`bootosID`),
-  KEY `groupID` (`groupID`),
-  KEY `membershipID` (`membershipID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-ALTER TABLE `pbs_bootos`
-  ADD CONSTRAINT `pbs_bootos_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE,
-  ADD CONSTRAINT `pbs_bootos_ibfk_3` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL;
-
+  ADD CONSTRAINT `pbs_bootosuser_ibfk_1` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`) ON DELETE CASCADE; 
+  
 CREATE TABLE IF NOT EXISTS `pbs_bootmenu` (
   `bootmenuID` int(11) NOT NULL AUTO_INCREMENT,
   `membershipID` int(11),