diff options
| author | James Atkinson <thefinn@users.sourceforge.net> | 2001-09-10 22:53:52 +0000 |
|---|---|---|
| committer | James Atkinson <thefinn@users.sourceforge.net> | 2001-09-10 22:53:52 +0000 |
| commit | 09ae82cd775b94cca794f08306c7e44cc1b8aed0 (patch) | |
| tree | db0aa2c824d8ab206dd7379066b55aeb4c0e4ebb /phpBB | |
| parent | 08cb824e37a4ef523cce6d394868e87f80fefd38 (diff) | |
| download | forums-09ae82cd775b94cca794f08306c7e44cc1b8aed0.tar forums-09ae82cd775b94cca794f08306c7e44cc1b8aed0.tar.gz forums-09ae82cd775b94cca794f08306c7e44cc1b8aed0.tar.bz2 forums-09ae82cd775b94cca794f08306c7e44cc1b8aed0.tar.xz forums-09ae82cd775b94cca794f08306c7e44cc1b8aed0.zip | |
Fixed up postgres schema and basic so they work with new config table and theme/templates combination
git-svn-id: file:///svn/phpbb/trunk@1025 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rwxr-xr-x | phpBB/db/postgres_basic.sql | 12 | ||||
| -rw-r--r-- | phpBB/db/postgres_schema.sql | 9 |
2 files changed, 11 insertions, 10 deletions
diff --git a/phpBB/db/postgres_basic.sql b/phpBB/db/postgres_basic.sql index 19e452a91d..995bb69436 100755 --- a/phpBB/db/postgres_basic.sql +++ b/phpBB/db/postgres_basic.sql @@ -85,17 +85,17 @@ INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, 'This is the subject', 'This is a demo post in the demo topic, what do you think of it?'); -- Themes -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1,'Default-Default','','','','','','','','','','','',NULL,NULL,NULL,'','','',NULL,NULL,NULL,'CCCCCC','DDDDDD','',NULL,NULL,NULL,'','','','','','','','','',NULL,NULL,NULL); +INSERT INTO phpbb_themes (themes_id, themes_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1,'Default','Default','','','','','','','','','','','','','','','','','','','','','CCCCCC','DDDDDD','','','','','','','',NULL,NULL,NULL,'','','','','',''); -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (2,'PSO-Default','','','FFFFFF','000000','002266','004411','','','','','','','','','000000','D2D2D2','BCBCBC','','','','EDEDED','DEDEDE','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'','','','','',''); +INSERT INTO phpbb_themes (themes_id, themes_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (2,'Default','PSO','','','FFFFFF','000000','002266','004411','','','','','','','','','000000','D2D2D2','BCBCBC','','','','EDEDED','DEDEDE','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'','','','','',''); -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (3,'PSO-Wheat','','','FFFFFF','000000','002266','004411','','','','','',NULL,NULL,NULL,'001100','E5CCA5','D4A294',NULL,NULL,NULL,'EBE4D9','DAD1C4','','row1','row2',NULL,'verdana,serif','arial,helvetica','courier',1,2,3,'000000','','',NULL,NULL,NULL); +INSERT INTO phpbb_themes (themes_id, themes_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (3,'Wheat','PSO','','','FFFFFF','000000','002266','004411','','','','','','','','','001100','E5CCA5','D4A294','','','','EBE4D9','DAD1C4','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'000000','','','','',''); -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (4,'PSO-Ocean','','','DFF5FF','000000','011001','2100cc','','','','','',NULL,NULL,NULL,'000000','A7C1CB','7897A8',NULL,NULL,NULL,'83D7CC','A0CCE0','','row1','row2',NULL,'verdana,serif','arial,helvetica','courier',1,2,3,'','','',NULL,NULL,NULL); +INSERT INTO phpbb_themes (themes_id, themes_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (4,'Ocean','PSO','','','DFF5FF','000000','011001','2100cc','','','','','','','','','000000','A7C1CB','7897A8','','','','83D7CC','A0CCE0','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'','','','','',''); -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (6,'PSO-Blue','','','FFFFFF','000000','417FB9','4E6172','0000AA','','','','','','','','000000','90BAE2','5195D4','','','','cde3f2','daedFd','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'000000','','','','',''); +INSERT INTO phpbb_themes (themes_id, themes_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (6,'Blue','PSO','','','FFFFFF','000000','417FB9','4E6172','0000AA','','','','','','','','000000','90BAE2','5195D4','','','','cde3f2','daedFd','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'000000','','','','',''); -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (7,'PSO-Cool Midnight','','','444444','ECECEC','EDF2F2','DDEDED','FFFFFF','EDF2F2','','','',NULL,NULL,NULL,'000000','80707F','66555F',NULL,NULL,NULL,'60707D','667A80','','row1','row2',NULL,'Verdana,serif','Arial,Helvetica,sans-serif','courier','','','','ECECEC','ECECEC','ECECEC',NULL,NULL,NULL); +INSERT INTO phpbb_themes (themes_id, themes_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (7,'Cool Midnight','PSO', '','','444444','ECECEC','EDF2F2','DDEDED','FFFFFF','EDF2F2','','','','','','','000000','80707F','66555F','','','','60707D','667A80','','row1','row2','','Verdana,serif','Arial,Helvetica,sans-serif','courier',NULL,NULL,NULL,'ECECEC','ECECEC','ECECEC','','',''); -- Smilies INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '1', ':D', 'icon_biggrin.gif', 'Very Happy'); diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql index c4e37ea370..0bbbb84e0a 100644 --- a/phpBB/db/postgres_schema.sql +++ b/phpBB/db/postgres_schema.sql @@ -233,9 +233,9 @@ CREATE INDEX rank_min_phpbb_ranks_index ON phpbb_ranks (rank_min); /* -------------------------------------------------------- - Table structure for table phpbb_session + Table structure for table phpbb_sessions -------------------------------------------------------- */ -CREATE TABLE phpbb_session ( +CREATE TABLE phpbb_sessions ( session_id char(32) DEFAULT '0' NOT NULL, session_user_id int4 DEFAULT '0' NOT NULL, session_start int4 DEFAULT '0' NOT NULL, @@ -246,8 +246,8 @@ CREATE TABLE phpbb_session ( session_logged_in int2 DEFAULT '0' NOT NULL, CONSTRAINT phpbb_session_pkey PRIMARY KEY (session_id) ); -CREATE INDEX session_user_id ON phpbb_session (session_user_id); -CREATE INDEX session_id_ip_user_id ON phpbb_session (session_id, session_ip, session_user_id); +CREATE INDEX session_user_id ON phpbb_sessions (session_user_id); +CREATE INDEX session_id_ip_user_id ON phpbb_sessions (session_id, session_ip, session_user_id); /* -------------------------------------------------------- @@ -268,6 +268,7 @@ CREATE TABLE phpbb_smilies ( CREATE TABLE phpbb_themes ( themes_id int4 DEFAULT nextval('phpbb_themes_id_seq'::text) NOT NULL, themes_name varchar(30), + template_name varchar(30) NOT NULL default '', head_stylesheet varchar(100), body_background varchar(100), body_bgcolor char(6), |