Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1009 - trunk/forge/portal-extensions/forge-forums/scripts
|
From: <jbo...@li...> - 2005-08-30 15:49:30
|
Author: adamw Date: 2005-08-30 11:49:22 -0400 (Tue, 30 Aug 2005) New Revision: 1009 Modified: trunk/forge/portal-extensions/forge-forums/scripts/all.sql trunk/forge/portal-extensions/forge-forums/scripts/conv.sql trunk/forge/portal-extensions/forge-forums/scripts/diff.sql trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql Log: New scripts Modified: trunk/forge/portal-extensions/forge-forums/scripts/all.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-30 13:14:09 UTC (rev 1008) +++ trunk/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-30 15:49:22 UTC (rev 1009) @@ -1,3 +1,13 @@ +-- THIS SHOULD BE RUN ON AN EXISTING NUKES3 DATABASE. PORTAL FORUMS TABLES AND +-- PORTAL USERS TABLES WILL BE CREATED AND POPULATED WITH DATA. + \. portal-pure.sql \. conv.sql \. portal-keys.sql + +-- AFTER ADDING THE KEYS: UPDATING POST COUNT + +-- ANY IDEAS WHY THIS ISN'T WORKING? +--UPDATE jbp_forums_posters posters SET posters.jbp_post_count = 10; +--- (SELECT COUNT(posts.jbp_id) FROM jbp_forums_posts posts WHERE +-- posts.jbp_poster_id = posters.jbp_id); Modified: trunk/forge/portal-extensions/forge-forums/scripts/conv.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-30 13:14:09 UTC (rev 1008) +++ trunk/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-30 15:49:22 UTC (rev 1009) @@ -22,8 +22,6 @@ INSERT INTO jbp_forums_posters (jbp_id, jbp_user_id, jbp_post_count) SELECT n.pn_uid, n.pn_uid, 0 FROM nuke_users n; --- TODO: update the post count - -- Copying data from categories. INSERT INTO jbp_forums_categories (jbp_id, jbp_order, jbp_title) SELECT n.cat_id, n.cat_order, n.cat_title Modified: trunk/forge/portal-extensions/forge-forums/scripts/diff.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/diff.sql 2005-08-30 13:14:09 UTC (rev 1008) +++ trunk/forge/portal-extensions/forge-forums/scripts/diff.sql 2005-08-30 15:49:22 UTC (rev 1009) @@ -90,8 +90,8 @@ -- SELECT t.forum_id FROM phpbb_topics t, php_bb posts p -- WHERE t.topic_id = p.topic_id AND p.post_id = xx `forum_id` smallint(5) unsigned default NULL, - -- NOTE: In phpbb, this references user_id. In forums portelt, this - -- references the posters table, (which references the users table - + -- NOTE: In phpbb, this references user_id. In forums portlet, this + -- references the posters table (which references the users table - -- so one addition step here). `poster_id` mediumint(11) default NULL, --> (jbp_poster_id) `post_time` datetime NOT NULL default '0000-00-00 00:00:00', --> jbp_create_date @@ -209,7 +209,7 @@ -- as it doesn't bring any necessary information. `vote_id` mediumint(8) unsigned NOT NULL auto_increment, `vote_desc_id` mediumint(8) unsigned default NULL, --> jbp_poll_id - -- NOTE: Unconsequently, this is a user id, not a poster id - in the portal DB. + -- NOTE: This is a user id, not a poster id - in the portal DB. `vote_user_id` mediumint(8) unsigned default NULL, --> jbp_poll_voted -- NOTE: This field is not present in portal DB. Loss of data. `vote_user_ip` char(8) NOT NULL default '', Modified: trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql 2005-08-30 13:14:09 UTC (rev 1008) +++ trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql 2005-08-30 15:49:22 UTC (rev 1009) @@ -1,305 +1,113 @@ --- MySQL dump 10.9 --- --- Host: localhost Database: jbossportal --- ------------------------------------------------------ --- Server version 4.1.11 +-- ADDING KEYS AND INDEXES TO EXISITING PORTAL TABLES - AFTER A DATA IMPORT -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - -- --- Current Database: `jbossportal` --- - -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `jbossportal` /*!40100 DEFAULT CHARACTER SET latin1 */; - -USE `jbossportal`; - --- -- Table structure for table `jbp_forums_categories` -- -DROP TABLE IF EXISTS `jbp_forums_categories`; -CREATE TABLE `jbp_forums_categories` ( - `jbp_id` int(11) NOT NULL auto_increment, - `jbp_order` int(11) default NULL, - `jbp_title` varchar(255) default NULL, - PRIMARY KEY (`jbp_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +ALTER TABLE jbp_forums_categories + MODIFY jbp_id int(11) NOT NULL auto_increment, + ADD PRIMARY KEY (jbp_id); -- -- Table structure for table `jbp_forums_forums` -- -DROP TABLE IF EXISTS `jbp_forums_forums`; -CREATE TABLE `jbp_forums_forums` ( - `jbp_id` int(11) NOT NULL auto_increment, - `jbp_category_id` int(11) default NULL, - `jbp_description` varchar(255) default NULL, - `jbp_last_post_id` int(11) default NULL, - `jbp_name` varchar(255) default NULL, - `jbp_order` int(11) default NULL, - `jbp_topic_count` int(11) default NULL, - `jbp_post_count` int(11) default NULL, - `jbp_prune_enable` tinyint(1) default NULL, - `jbp_prune_next` int(11) default NULL, - `jbp_status` int(11) default NULL, - `jbp_type` int(11) default NULL, - PRIMARY KEY (`jbp_id`), - KEY `FK543743187E1ECA5A` (`jbp_category_id`), - KEY `FK54374318C1B3E31F` (`jbp_last_post_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +ALTER TABLE jbp_forums_forums MODIFY jbp_id int(11) NOT NULL auto_increment, + ADD PRIMARY KEY (jbp_id), + ADD INDEX (jbp_category_id), + ADD INDEX (jbp_last_post_id), + ADD FOREIGN KEY (jbp_category_id) REFERENCES jbp_forums_categories (jbp_id), + ADD FOREIGN KEY (jbp_last_post_id) REFERENCES jbp_forums_posts (jbp_id); -- -- Table structure for table `jbp_forums_forumswatch` -- -DROP TABLE IF EXISTS `jbp_forums_forumswatch`; -CREATE TABLE `jbp_forums_forumswatch` ( - `jbp_id` int(11) NOT NULL default '0', - `jbp_forum_id` int(11) default NULL, - PRIMARY KEY (`jbp_id`), - KEY `FK3A89B0B776BE0BCA` (`jbp_id`), - KEY `FK3A89B0B77892A9BA` (`jbp_forum_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +ALTER TABLE jbp_forums_forumswatch + ADD PRIMARY KEY (jbp_id), + ADD INDEX (jbp_forum_id), + ADD FOREIGN KEY (jbp_forum_id) REFERENCES jbp_forums_forums (jbp_id), + ADD FOREIGN KEY (jbp_id) REFERENCES jbp_forums_watch (jbp_id); -- -- Table structure for table `jbp_forums_poll_option` -- -DROP TABLE IF EXISTS `jbp_forums_poll_option`; -CREATE TABLE `jbp_forums_poll_option` ( - `jbp_poll_id` int(11) NOT NULL default '0', - `jbp_votes` int(11) NOT NULL default '0', - `jbp_question` varchar(255) NOT NULL default '', - `jbp_poll_option_position` int(11) NOT NULL default '0', - PRIMARY KEY (`jbp_poll_id`,`jbp_poll_option_position`), - KEY `FKFF2EB50F8050E3A` (`jbp_poll_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +ALTER TABLE jbp_forums_poll_option + ADD PRIMARY KEY (jbp_poll_id, jbp_poll_option_position), + ADD INDEX (jbp_poll_id), + ADD FOREIGN KEY (jbp_poll_id) REFERENCES jbp_forums_polls (jbp_id); -- -- Table structure for table `jbp_forums_poll_voted` -- -DROP TABLE IF EXISTS `jbp_forums_poll_voted`; -CREATE TABLE `jbp_forums_poll_voted` ( - `jbp_poll_id` int(11) NOT NULL default '0', - `jbp_poll_voted` int(11) NOT NULL default '0', - PRIMARY KEY (`jbp_poll_id`,`jbp_poll_voted`), - KEY `FK3A29E2E08050E3A` (`jbp_poll_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +ALTER TABLE jbp_forums_poll_voted + ADD PRIMARY KEY (jbp_poll_id, jbp_poll_voted), + ADD INDEX (jbp_poll_id), + ADD FOREIGN KEY (jbp_poll_id) REFERENCES jbp_forums_polls (jbp_id); -- -- Table structure for table `jbp_forums_polls` -- -DROP TABLE IF EXISTS `jbp_forums_polls`; -CREATE TABLE `jbp_forums_polls` ( - `jbp_poll_id` int(11) NOT NULL auto_increment, - `jbp_title` varchar(255) default NULL, - `jbp_length` int(11) default NULL, - `jbp_creation_date` datetime NOT NULL default '0000-00-00 00:00:00', - PRIMARY KEY (`jbp_poll_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +ALTER TABLE jbp_forums_polls + MODIFY jbp_poll_id int(11) NOT NULL auto_increment, + ADD PRIMARY KEY (jbp_poll_id); -- -- Table structure for table `jbp_forums_posters` -- -DROP TABLE IF EXISTS `jbp_forums_posters`; -CREATE TABLE `jbp_forums_posters` ( - `jbp_id` int(11) NOT NULL auto_increment, - `jbp_user_id` int(11) default NULL, - `jbp_post_count` int(11) default NULL, - PRIMARY KEY (`jbp_id`), - UNIQUE KEY `jbp_user_id` (`jbp_user_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +ALTER TABLE jbp_forums_posters + MODIFY jbp_id int(11) NOT NULL auto_increment, + ADD PRIMARY KEY (jbp_id), + ADD UNIQUE (jbp_user_id); -- -- Table structure for table `jbp_forums_posts` -- -DROP TABLE IF EXISTS `jbp_forums_posts`; -CREATE TABLE `jbp_forums_posts` ( - `jbp_id` int(11) NOT NULL auto_increment, - `jbp_topic_id` int(11) default NULL, - `jbp_edit_count` int(11) default NULL, - `jbp_edit_date` datetime default NULL, - `jbp_create_date` datetime default NULL, - `jbp_subject` varchar(255) default NULL, - `jbp_text` text, - `jbp_htmlenabled` tinyint(1) default NULL, - `jbp_poster_id` int(11) default NULL, - PRIMARY KEY (`jbp_id`), - KEY `FKF2C0436DBFB64FFA` (`jbp_topic_id`), - KEY `FKF2C0436D499BFC7A` (`jbp_poster_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +ALTER TABLE jbp_forums_posts + MODIFY jbp_id int(11) NOT NULL auto_increment, + ADD PRIMARY KEY (jbp_id), + ADD INDEX (jbp_topic_id), + ADD INDEX (jbp_poster_id), + ADD FOREIGN KEY (jbp_topic_id) REFERENCES jbp_forums_topics (jbp_id), + ADD FOREIGN KEY (jbp_poster_id) REFERENCES jbp_forums_posters (jbp_id); -- -- Table structure for table `jbp_forums_topics` -- -DROP TABLE IF EXISTS `jbp_forums_topics`; -CREATE TABLE `jbp_forums_topics` ( - `jbp_id` int(11) NOT NULL auto_increment, - `jbp_forum_id` int(11) default NULL, - `jbp_view_count` int(11) default NULL, - `jbp_replies` int(11) default NULL, - `jbp_first_post_id` int(11) default NULL, - `jbp_last_post_id` int(11) default NULL, - `jbp_last_post_date` datetime default NULL, - `jbp_poster` int(11) default NULL, - `jbp_type` int(11) default NULL, - `jbp_status` int(11) default NULL, - `jbp_subject` varchar(255) default NULL, - `jbp_poll` int(11) default NULL, - PRIMARY KEY (`jbp_id`), - KEY `FK6C1A04CA7892A9BA` (`jbp_forum_id`), - KEY `FK6C1A04CA925A910C` (`jbp_poll`), - KEY `FK6C1A04CAC1B3E31F` (`jbp_last_post_id`), - KEY `FK6C1A04CA577068CB` (`jbp_first_post_id`), - KEY `FK6C1A04CA145469A8` (`jbp_poster`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +ALTER TABLE jbp_forums_topics + MODIFY jbp_id int(11) NOT NULL auto_increment, + ADD PRIMARY KEY (jbp_id), + ADD INDEX (jbp_forum_id), + ADD INDEX (jbp_poll), + ADD INDEX (jbp_last_post_id), + ADD INDEX (jbp_first_post_id), + ADD INDEX (jbp_poster), + ADD FOREIGN KEY (jbp_forum_id) REFERENCES jbp_forums_forums (jbp_id), + ADD FOREIGN KEY (jbp_poll) REFERENCES jbp_forums_polls (jbp_id), + ADD FOREIGN KEY (jbp_last_post_id) REFERENCES jbp_forums_posts (jbp_id), + ADD FOREIGN KEY (jbp_first_post_id) REFERENCES jbp_forums_posts (jbp_id), + ADD FOREIGN KEY (jbp_poster) REFERENCES jbp_forums_posters (jbp_id); -- -- Table structure for table `jbp_forums_topicswatch` -- -DROP TABLE IF EXISTS `jbp_forums_topicswatch`; -CREATE TABLE `jbp_forums_topicswatch` ( - `jbp_id` int(11) NOT NULL default '0', - `jbp_topic_id` int(11) default NULL, - PRIMARY KEY (`jbp_id`), - KEY `FK46F62E4576BE0BCA` (`jbp_id`), - KEY `FK46F62E45BFB64FFA` (`jbp_topic_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +-- AS THIS FEATURE IS NOT YET IMPLEMENTED, LEAVING IT OUT. -- -- Table structure for table `jbp_forums_watch` -- -DROP TABLE IF EXISTS `jbp_forums_watch`; -CREATE TABLE `jbp_forums_watch` ( - `jbp_id` int(11) NOT NULL auto_increment, - `jbp_poster_id` int(11) default NULL, - `jbp_mode` int(11) default NULL, - PRIMARY KEY (`jbp_id`), - KEY `FKF31C8C69499BFC7A` (`jbp_poster_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +ALTER TABLE jbp_forums_watch + MODIFY jbp_id int(11) NOT NULL auto_increment, + ADD PRIMARY KEY (jbp_id), + ADD INDEX (jbp_poster_id), + ADD FOREIGN KEY (jbp_poster_id) REFERENCES jbp_forums_posters (jbp_id); --- --- Table structure for table `jbp_role_membership` --- - -DROP TABLE IF EXISTS `jbp_role_membership`; -CREATE TABLE `jbp_role_membership` ( - `jbp_rid` int(11) NOT NULL default '0', - `jbp_uid` int(11) NOT NULL default '0', - PRIMARY KEY (`jbp_uid`,`jbp_rid`), - KEY `FKF4101738A7430374` (`jbp_rid`), - KEY `FKF4101738E70E4BD7` (`jbp_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_roles` --- - -DROP TABLE IF EXISTS `jbp_roles`; -CREATE TABLE `jbp_roles` ( - `jbp_rid` int(11) NOT NULL auto_increment, - `jbp_name` varchar(255) default NULL, - `jbp_displayname` varchar(255) default NULL, - PRIMARY KEY (`jbp_rid`), - UNIQUE KEY `jbp_name` (`jbp_name`), - UNIQUE KEY `jbp_displayname` (`jbp_displayname`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_user_pref` --- - -DROP TABLE IF EXISTS `jbp_user_pref`; -CREATE TABLE `jbp_user_pref` ( - `jbp_id` int(11) NOT NULL auto_increment, - `jbp_name` varchar(255) NOT NULL default '', - `jbp_type` int(11) default NULL, - `jbp_set_id` int(11) default NULL, - PRIMARY KEY (`jbp_id`), - KEY `FK93CC44D0AF499A90` (`jbp_set_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_user_pref_prop_value` --- - -DROP TABLE IF EXISTS `jbp_user_pref_prop_value`; -CREATE TABLE `jbp_user_pref_prop_value` ( - `jbp_prop_id` int(11) NOT NULL default '0', - `jbp_value` varchar(255) default NULL, - `jbp_idx` int(11) NOT NULL default '0', - PRIMARY KEY (`jbp_prop_id`,`jbp_idx`), - KEY `FKC4963064D50D5281` (`jbp_prop_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_user_pref_set` --- - -DROP TABLE IF EXISTS `jbp_user_pref_set`; -CREATE TABLE `jbp_user_pref_set` ( - `jbp_id` int(11) NOT NULL auto_increment, - `jbp_parent_id` int(11) default NULL, - `name` varchar(255) NOT NULL default '', - PRIMARY KEY (`jbp_id`), - KEY `FK97AA4873E3AFC41A` (`jbp_parent_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_user_prop` --- - -DROP TABLE IF EXISTS `jbp_user_prop`; -CREATE TABLE `jbp_user_prop` ( - `jbp_uid` int(11) NOT NULL default '0', - `jbp_value` varchar(255) default NULL, - `jbp_name` varchar(255) NOT NULL default '', - PRIMARY KEY (`jbp_uid`,`jbp_name`), - KEY `FK93CC4610E70E4BD7` (`jbp_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_users` --- - -DROP TABLE IF EXISTS `jbp_users`; -CREATE TABLE `jbp_users` ( - `jbp_uid` int(11) NOT NULL auto_increment, - `jbp_root_pref_set_id` int(11) default NULL, - `jbp_uname` varchar(255) default NULL, - `jbp_givenname` varchar(255) default NULL, - `jbp_familyname` varchar(255) default NULL, - `jbp_password` varchar(255) default NULL, - `jbp_realemail` varchar(255) default NULL, - `jbp_fakeemail` varchar(255) default NULL, - `jbp_regdate` datetime default NULL, - `jbp_viewrealemail` tinyint(1) default NULL, - `jbp_enabled` tinyint(1) default NULL, - PRIMARY KEY (`jbp_uid`), - UNIQUE KEY `jbp_uname` (`jbp_uname`), - KEY `FKF6060141FD4AFF8F` (`jbp_root_pref_set_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - +-- REST OF THE TABLES ALREADY HAVE KEY INFO. Modified: trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql 2005-08-30 13:14:09 UTC (rev 1008) +++ trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql 2005-08-30 15:49:22 UTC (rev 1009) @@ -1,9 +1,3 @@ --- MySQL dump 10.9 --- --- Host: localhost Database: jbossportal --- ------------------------------------------------------ --- Server version 4.1.11 - -- PORTAL DB STRUCTURE WITHOUT KEY INFORMATION (FOR A PAINLESS DATA IMPORT) -- @@ -144,12 +138,14 @@ DROP TABLE IF EXISTS `jbp_forums_watch`; CREATE TABLE `jbp_forums_watch` ( - `jbp_id` int(11) NOT NULL auto_increment, + `jbp_id` int(11) NOT NULL, `jbp_poster_id` int(11) default NULL, - `jbp_mode` int(11) default NULL, - PRIMARY KEY (`jbp_id`) + `jbp_mode` int(11) default NULL ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; +-- FROM NOW ON, KEY INFORMATION IS PRESENT - IT DOES NOT CONFILCT WITH DATA +-- IMPORT. + -- -- Table structure for table `jbp_role_membership` -- @@ -157,7 +153,10 @@ DROP TABLE IF EXISTS `jbp_role_membership`; CREATE TABLE `jbp_role_membership` ( `jbp_rid` int(11) NOT NULL default '0', - `jbp_uid` int(11) NOT NULL default '0' + `jbp_uid` int(11) NOT NULL default '0', + PRIMARY KEY (`jbp_uid`,`jbp_rid`), + KEY `FKF4101738A7430374` (`jbp_rid`), + KEY `FKF4101738E70E4BD7` (`jbp_uid`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; -- @@ -166,9 +165,12 @@ DROP TABLE IF EXISTS `jbp_roles`; CREATE TABLE `jbp_roles` ( - `jbp_rid` int(11) NOT NULL, + `jbp_rid` int(11) NOT NULL auto_increment, `jbp_name` varchar(255) default NULL, - `jbp_displayname` varchar(255) default NULL + `jbp_displayname` varchar(255) default NULL, + PRIMARY KEY (`jbp_rid`), + UNIQUE KEY `jbp_name` (`jbp_name`), + UNIQUE KEY `jbp_displayname` (`jbp_displayname`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; -- @@ -177,10 +179,12 @@ DROP TABLE IF EXISTS `jbp_user_pref`; CREATE TABLE `jbp_user_pref` ( - `jbp_id` int(11) NOT NULL, + `jbp_id` int(11) NOT NULL auto_increment, `jbp_name` varchar(255) NOT NULL default '', `jbp_type` int(11) default NULL, - `jbp_set_id` int(11) default NULL + `jbp_set_id` int(11) default NULL, + PRIMARY KEY (`jbp_id`), + KEY `FK93CC44D0AF499A90` (`jbp_set_id`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; -- @@ -191,7 +195,9 @@ CREATE TABLE `jbp_user_pref_prop_value` ( `jbp_prop_id` int(11) NOT NULL default '0', `jbp_value` varchar(255) default NULL, - `jbp_idx` int(11) NOT NULL default '0' + `jbp_idx` int(11) NOT NULL default '0', + PRIMARY KEY (`jbp_prop_id`,`jbp_idx`), + KEY `FKC4963064D50D5281` (`jbp_prop_id`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; -- @@ -200,9 +206,11 @@ DROP TABLE IF EXISTS `jbp_user_pref_set`; CREATE TABLE `jbp_user_pref_set` ( - `jbp_id` int(11) NOT NULL, + `jbp_id` int(11) NOT NULL auto_increment, `jbp_parent_id` int(11) default NULL, - `name` varchar(255) NOT NULL default '' + `name` varchar(255) NOT NULL default '', + PRIMARY KEY (`jbp_id`), + KEY `FK97AA4873E3AFC41A` (`jbp_parent_id`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; -- @@ -213,7 +221,9 @@ CREATE TABLE `jbp_user_prop` ( `jbp_uid` int(11) NOT NULL default '0', `jbp_value` varchar(255) default NULL, - `jbp_name` varchar(255) NOT NULL default '' + `jbp_name` varchar(255) NOT NULL default '', + PRIMARY KEY (`jbp_uid`,`jbp_name`), + KEY `FK93CC4610E70E4BD7` (`jbp_uid`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; -- @@ -222,7 +232,7 @@ DROP TABLE IF EXISTS `jbp_users`; CREATE TABLE `jbp_users` ( - `jbp_uid` int(11) NOT NULL, + `jbp_uid` int(11) NOT NULL auto_increment, `jbp_root_pref_set_id` int(11) default NULL, `jbp_uname` varchar(255) default NULL, `jbp_givenname` varchar(255) default NULL, @@ -232,5 +242,8 @@ `jbp_fakeemail` varchar(255) default NULL, `jbp_regdate` datetime default NULL, `jbp_viewrealemail` tinyint(1) default NULL, - `jbp_enabled` tinyint(1) default NULL + `jbp_enabled` tinyint(1) default NULL, + PRIMARY KEY (`jbp_uid`), + UNIQUE KEY `jbp_uname` (`jbp_uname`), + KEY `FKF6060141FD4AFF8F` (`jbp_root_pref_set_id`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; |
