zfconf

1 files changed, 14 insertions, 4 deletions

diff --git a/pbs.sql b/pbs.sql
index c88ad27..9eb1ddc 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -9,23 +9,33 @@ CREATE TABLE IF NOT EXISTS `pbs_group` (
   PRIMARY KEY (`groupID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
 
+CREATE TABLE IF NOT EXISTS `pbs_rightcategory` (
+  `rightcategoryID` int(11) NOT NULL AUTO_INCREMENT,
+  `title` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  PRIMARY KEY (`rightcategoryID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
 
 CREATE TABLE IF NOT EXISTS `pbs_right` (
   `rightID` int(11) NOT NULL AUTO_INCREMENT,
+  `rightcategoryID` int(11) NOT NULL,
   `title` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `description` varchar(140) COLLATE utf8_unicode_ci,
-  PRIMARY KEY (`rightID`)
+  `description` varchar(140) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rightID`),
+  KEY `rightcategoryID` (`rightcategoryID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
 
+ALTER TABLE `pbs_right`
+  ADD CONSTRAINT `pbs_right_ibfk_1` FOREIGN KEY (`rightcategoryID`) REFERENCES `pbs_rightcategory` (`rightcategoryID`) ON DELETE CASCADE;
 
 CREATE TABLE IF NOT EXISTS `pbs_role` (
   `roleID` int(11) NOT NULL AUTO_INCREMENT,
   `groupID` int(11) NOT NULL,
   `title` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `description` varchar(140) COLLATE utf8_unicode_ci,
+  `description` varchar(140) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `inheritance` tinyint(1) NOT NULL,
   PRIMARY KEY (`roleID`),
   KEY `groupID` (`groupID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=5 ;
 
 ALTER TABLE `pbs_role`
   ADD CONSTRAINT `pbs_role_ibfk_1` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE;