A few changes to topic moving. TOPIC_MOVE constant gets set to the topic_status field so that moved topics don't 'stick' at the top of viewforum. Also, added topic_moved_id field to store the ID that the topic moves to.

git-svn-id: file:///svn/phpbb/trunk@877 89ea8834-ac86-4346-8a33-228a782c2dd0
author: James Atkinson <thefinn@users.sourceforge.net> 2001-08-14 20:43:56 +0000
committer: James Atkinson <thefinn@users.sourceforge.net> 2001-08-14 20:43:56 +0000
commit: e2710a5101e53492b0e040456547187ccff601e9 (patch)
tree: 33677f2ed1647e17c54b384003dbb550ec6669d3 /phpBB/db
parent: bd8652f1869c477b5b7e066eb61b435312c7cd3e (diff)
download: forums-e2710a5101e53492b0e040456547187ccff601e9.tar
forums-e2710a5101e53492b0e040456547187ccff601e9.tar.gz
forums-e2710a5101e53492b0e040456547187ccff601e9.tar.bz2
forums-e2710a5101e53492b0e040456547187ccff601e9.tar.xz
forums-e2710a5101e53492b0e040456547187ccff601e9.zip
2 files changed, 54 insertions, 52 deletions
diff --git a/phpBB/db/mysql_schema.sql b/phpBB/db/mysql_schema.sql
index 486e385092..00b7140716 100644
--- a/phpBB/db/mysql_schema.sql
+++ b/phpBB/db/mysql_schema.sql
@@ -43,7 +43,7 @@ CREATE TABLE phpbb_user_group (
 DROP TABLE IF EXISTS phpbb_groups;
 CREATE TABLE phpbb_groups (
    group_id int(11) NOT NULL auto_increment,
-   group_type tinyint(4) DEFAULT '1' NOT NULL, 
+   group_type tinyint(4) DEFAULT '1' NOT NULL,
    group_name varchar(40) NOT NULL,
    group_description varchar(255) NOT NULL,
    group_moderator int(11) DEFAULT '0' NOT NULL,
@@ -85,46 +85,46 @@ CREATE TABLE phpbb_categories (
 DROP TABLE IF EXISTS phpbb_config;
 CREATE TABLE phpbb_config (
    config_id int(10) NOT NULL auto_increment,
-   board_disable tinyint(1) DEFAULT '0' NOT NULL, 
-   board_startdate int(11), 
+   board_disable tinyint(1) DEFAULT '0' NOT NULL,
+   board_startdate int(11),
    sitename varchar(100),
    cookie_name char(20),
    cookie_path char(25),
-   cookie_domain char(50), 
-   cookie_secure tinyint(1), 
-   session_length int(11), 
+   cookie_domain char(50),
+   cookie_secure tinyint(1),
+   session_length int(11),
    allow_html tinyint(1),
-   allow_html_tags char(255) DEFAULT 'b,u,i,pre,font color' NOT NULL, 
+   allow_html_tags char(255) DEFAULT 'b,u,i,pre,font color' NOT NULL,
    allow_bbcode tinyint(1),
    allow_smilies tinyint(1),
    allow_sig tinyint(1),
    allow_namechange tinyint(1),
    allow_theme_create tinyint(1),
-   allow_avatar_local tinyint(1) DEFAULT '0' NOT NULL, 
-   allow_avatar_remote tinyint(1) DEFAULT '0' NOT NULL, 
+   allow_avatar_local tinyint(1) DEFAULT '0' NOT NULL,
+   allow_avatar_remote tinyint(1) DEFAULT '0' NOT NULL,
    allow_avatar_upload tinyint(1) DEFAULT '0' NOT NULL,
    override_themes tinyint(3),
    posts_per_page int(10),
    topics_per_page int(10),
    hot_threshold int(10),
    email_sig varchar(255),
-   email_from varchar(100), 
-   smtp_delivery smallint(1) DEFAULT '0' NOT NULL, 
-   smtp_host varchar(50), 
-   require_activation tinyint(1) DEFAULT '0' NOT NULL, 
+   email_from varchar(100),
+   smtp_delivery smallint(1) DEFAULT '0' NOT NULL,
+   smtp_host varchar(50),
+   require_activation tinyint(1) DEFAULT '0' NOT NULL,
    flood_interval int(4) NOT NULL,
    avatar_filesize int(11) DEFAULT '6144' NOT NULL,
-   avatar_max_width smallint(6) DEFAULT '70' NOT NULL, 
-   avatar_max_height smallint(6) DEFAULT '70' NOT NULL, 
+   avatar_max_width smallint(6) DEFAULT '70' NOT NULL,
+   avatar_max_height smallint(6) DEFAULT '70' NOT NULL,
    avatar_path varchar(255) DEFAULT 'images/avatars' NOT NULL,
-   smilies_path char(100) DEFAULT 'images/smiles' NOT NULL, 
+   smilies_path char(100) DEFAULT 'images/smiles' NOT NULL,
    default_theme int(11) DEFAULT '1' NOT NULL,
    default_lang varchar(255),
    default_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,
    system_timezone int(11) DEFAULT '0' NOT NULL,
    sys_template varchar(100) DEFAULT 'Default' NOT NULL,
-   prune_enable tinyint(1) DEFAULT '1' NOT NULL, 
-   gzip_compress tinyint(1) DEFAULT '0' NOT NULL, 
+   prune_enable tinyint(1) DEFAULT '1' NOT NULL,
+   gzip_compress tinyint(1) DEFAULT '0' NOT NULL,
    PRIMARY KEY (config_id)
 );
 
@@ -164,7 +164,7 @@ CREATE TABLE phpbb_forums (
    cat_id int(10) NOT NULL,
    forum_name varchar(150),
    forum_desc text,
-   forum_status tinyint(4) DEFAULT '0' NOT NULL, 
+   forum_status tinyint(4) DEFAULT '0' NOT NULL,
    forum_order int(11) DEFAULT '1' NOT NULL,
    forum_posts int(11) DEFAULT '0' NOT NULL,
    forum_topics tinyint(4) DEFAULT '0' NOT NULL,
@@ -201,8 +201,8 @@ CREATE TABLE phpbb_posts (
    forum_id int(10) DEFAULT '0' NOT NULL,
    poster_id int(10) DEFAULT '0' NOT NULL,
    post_time int(10) DEFAULT '0' NOT NULL,
-   poster_ip char(8) NOT NULL, 
-   post_username varchar(30), 
+   poster_ip char(8) NOT NULL,
+   post_username varchar(30),
    enable_bbcode smallint(1) DEFAULT '1' NOT NULL,
    enable_html smallint(1) DEFAULT '0' NOT NULL,
    enable_smilies smallint(1) DEFAULT '1' NOT NULL,
@@ -416,7 +416,8 @@ CREATE TABLE phpbb_topics (
    topic_status tinyint(3) DEFAULT '0' NOT NULL,
    topic_type tinyint(3) DEFAULT '0' NOT NULL,
    topic_last_post_id int(11) DEFAULT '0' NOT NULL,
-   topic_notify tinyint(1) DEFAULT '0' NOT NULL, 
+   topic_moved_id int(10),
+   topic_notify tinyint(1) DEFAULT '0' NOT NULL,
    PRIMARY KEY (topic_id),
    KEY forum_id (forum_id),
    KEY topic_id (topic_id)
@@ -458,11 +459,11 @@ CREATE TABLE phpbb_users (
    user_attachsig tinyint(1),
    user_allowhtml tinyint(1),
    user_allowbbcode tinyint(1),
-   user_allowsmile tinyint(1), 
-   user_allowavatar tinyint(1) DEFAULT '1' NOT NULL, 
-   user_allow_pm tinyint(1) DEFAULT '1' NOT NULL, 
-   user_allow_viewonline tinyint(1) DEFAULT '1' NOT NULL, 
-   user_notify_pm tinyint(1) DEFAULT '1' NOT NULL, 
+   user_allowsmile tinyint(1),
+   user_allowavatar tinyint(1) DEFAULT '1' NOT NULL,
+   user_allow_pm tinyint(1) DEFAULT '1' NOT NULL,
+   user_allow_viewonline tinyint(1) DEFAULT '1' NOT NULL,
+   user_notify_pm tinyint(1) DEFAULT '1' NOT NULL,
    user_regdate int(11) DEFAULT '0' NOT NULL,
    user_rank int(11) DEFAULT '0',
    user_avatar varchar(100),
diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql
index 486cc52ab0..af56e68d56 100644
--- a/phpBB/db/postgres_schema.sql
+++ b/phpBB/db/postgres_schema.sql
@@ -86,32 +86,32 @@ CREATE TABLE phpbb_categories (
 -------------------------------------------------------- */
 CREATE TABLE phpbb_config (
    config_id int2 NOT NULL,
-   board_disable int2 DEFAULT '0' NOT NULL, 
-   board_startdate int4, 
+   board_disable int2 DEFAULT '0' NOT NULL,
+   board_startdate int4,
    sitename varchar(100) NOT NULL,
    cookie_name char(20),
    cookie_path char(25),
-   cookie_domain char(50), 
-   cookie_secure int2, 
-   session_length int4, 
+   cookie_domain char(50),
+   cookie_secure int2,
+   session_length int4,
    allow_html int2 NOT NULL,
-   allow_html_tags char(255) DEFAULT 'b,u,i,pre,font color' NOT NULL, 
+   allow_html_tags char(255) DEFAULT 'b,u,i,pre,font color' NOT NULL,
    allow_bbcode int2 NOT NULL,
    allow_smilies int2 NOT NULL,
    allow_sig int2 NOT NULL,
    allow_namechange int2 NOT NULL,
    allow_theme_create int2 NOT NULL,
-   allow_avatar_local int2 DEFAULT '0' NOT NULL, 
-   allow_avatar_remote int2 DEFAULT '0' NOT NULL, 
+   allow_avatar_local int2 DEFAULT '0' NOT NULL,
+   allow_avatar_remote int2 DEFAULT '0' NOT NULL,
    allow_avatar_upload int2 DEFAULT '0' NOT NULL,
    posts_per_page int2 NOT NULL,
    topics_per_page int2 NOT NULL,
    hot_threshold int2 NOT NULL,
    email_sig varchar(255) NOT NULL,
    email_from varchar(100) NOT NULL,
-   smtp_delivery int2 DEFAULT '0' NOT NULL, 
-   smtp_host varchar(50), 
-   require_activation int2 DEFAULT '0' NOT NULL, 
+   smtp_delivery int2 DEFAULT '0' NOT NULL,
+   smtp_host varchar(50),
+   require_activation int2 DEFAULT '0' NOT NULL,
    default_theme int4 NOT NULL,
    default_dateformat varchar(20) NOT NULL,
    default_lang varchar(50) NOT NULL,
@@ -121,11 +121,11 @@ CREATE TABLE phpbb_config (
    avatar_max_width int2 DEFAULT '70' NOT NULL,
    avatar_max_height int2 DEFAULT '70' NOT NULL,
    avatar_path varchar(255) DEFAULT 'images/avatars' NOT NULL,
-   smilies_patch varchar(50) DEFAULT 'images/smiles' NOT NULL, 
+   smilies_patch varchar(50) DEFAULT 'images/smiles' NOT NULL,
    override_themes int2 NOT NULL,
    flood_interval int NOT NULL,
-   prune_enable int2 DEFAULT '1' NOT NULL, 
-   gzip_compress int2 DEFAULT '0' NOT NULL, 
+   prune_enable int2 DEFAULT '1' NOT NULL,
+   gzip_compress int2 DEFAULT '0' NOT NULL,
    CONSTRAINT phpbb_config_pkey PRIMARY KEY (config_id)
 );
 
@@ -148,7 +148,7 @@ CREATE TABLE phpbb_forums (
    cat_id int4,
    forum_name varchar(150),
    forum_desc text,
-   forum_status int2 DEFAULT '0' NOT NULL, 
+   forum_status int2 DEFAULT '0' NOT NULL,
    forum_order int4 DEFAULT '1' NOT NULL,
    forum_posts int4 DEFAULT '0' NOT NULL,
    forum_topics int4 DEFAULT '0' NOT NULL,
@@ -190,10 +190,10 @@ CREATE  INDEX forum_id_phpbb_forum_prune_index ON phpbb_forum_prune (forum_id);
 -------------------------------------------------------- */
 CREATE TABLE phpbb_groups (
    group_id int4 DEFAULT nextval('phpbb_groups_id_seq'::text) NOT NULL,
-   group_type int2 DEFAULT '1' NOT NULL, 
+   group_type int2 DEFAULT '1' NOT NULL,
    group_name varchar(100) NOT NULL,
    group_description varchar(255) NOT NULL,
-   group_moderator int4 NOT NULL, 
+   group_moderator int4 NOT NULL,
    group_single_user int2 NOT NULL
 );
 
@@ -206,15 +206,15 @@ CREATE TABLE phpbb_posts (
    topic_id int4 DEFAULT '0' NOT NULL,
    forum_id int4 DEFAULT '0' NOT NULL,
    poster_id int4 DEFAULT '0' NOT NULL,
-   post_time int4 DEFAULT '0' NOT NULL, 
-   post_username varchar(30), 
+   post_time int4 DEFAULT '0' NOT NULL,
+   post_username varchar(30),
    poster_ip char(8) DEFAULT '' NOT NULL,
    enable_bbcode int2 DEFAULT '1' NOT NULL,
    enable_html int2 DEFAULT '0' NOT NULL,
    enable_smilies int2 DEFAULT '1' NOT NULL,
-   bbcode_uid varchar(10) DEFAULT '' NOT NULL, 
+   bbcode_uid varchar(10) DEFAULT '' NOT NULL,
    post_edit_time int4,
-   post_edit_count int2 DEFAULT '0' NOT NULL, 
+   post_edit_count int2 DEFAULT '0' NOT NULL,
    CONSTRAINT phpbb_posts_pkey PRIMARY KEY (post_id)
 );
 CREATE  INDEX forum_id_phpbb_posts_index ON phpbb_posts (forum_id);
@@ -412,6 +412,7 @@ CREATE TABLE phpbb_topics (
    topic_type int2 DEFAULT '0' NOT NULL,
    topic_notify int2 DEFAULT '0',
    topic_last_post_id int4 DEFAULT '0' NOT NULL,
+   topic_moved_id int4,
    CONSTRAINT phpbb_topics_pkey PRIMARY KEY (topic_id)
 );
 CREATE  INDEX _phpbb_topics_index ON phpbb_topics (forum_id, topic_id);
@@ -471,10 +472,10 @@ CREATE TABLE phpbb_users (
    user_allowhtml int2,
    user_allowbbcode int2,
    user_allowsmile int2,
-   user_allow_pm int2 DEFAULT '1' NOT NULL, 
-   user_allowavatar int2 DEFAULT '1' NOT NULL, 
-   user_allow_viewonline int2 DEFAULT '1' NOT NULL, 
-   user_notify_pm int2 DEFAULT '1' NOT NULL, 
+   user_allow_pm int2 DEFAULT '1' NOT NULL,
+   user_allowavatar int2 DEFAULT '1' NOT NULL,
+   user_allow_viewonline int2 DEFAULT '1' NOT NULL,
+   user_notify_pm int2 DEFAULT '1' NOT NULL,
    user_rank int4 DEFAULT '0',
    user_avatar varchar(100),
    user_level int4 DEFAULT '1',
author	James Atkinson <thefinn@users.sourceforge.net>	2001-08-14 20:43:56 +0000
committer	James Atkinson <thefinn@users.sourceforge.net>	2001-08-14 20:43:56 +0000
commit	e2710a5101e53492b0e040456547187ccff601e9 (patch)
tree	33677f2ed1647e17c54b384003dbb550ec6669d3 /phpBB/db
parent	bd8652f1869c477b5b7e066eb61b435312c7cd3e (diff)
download	forums-e2710a5101e53492b0e040456547187ccff601e9.tar forums-e2710a5101e53492b0e040456547187ccff601e9.tar.gz forums-e2710a5101e53492b0e040456547187ccff601e9.tar.bz2 forums-e2710a5101e53492b0e040456547187ccff601e9.tar.xz forums-e2710a5101e53492b0e040456547187ccff601e9.zip