2 files changed, 46 insertions, 22 deletions
diff --git a/phpBB/db/mysql_schema.sql b/phpBB/db/mysql_schema.sql
index 379b905f0c..5a9d7b5004 100644
--- a/phpBB/db/mysql_schema.sql
+++ b/phpBB/db/mysql_schema.sql
@@ -238,19 +238,33 @@ CREATE TABLE phpbb_posts_text (
 #
 # Table structure for table 'phpbb_privmsgs'
 #
-DROP TABLE IF EXISTS phpbb_privmsgs;
 
+DROP TABLE IF EXISTS phpbb_privmsgs;
 CREATE TABLE phpbb_privmsgs (
-   msg_id int(10) NOT NULL auto_increment,
-   from_userid int(10) DEFAULT '0' NOT NULL,
-   to_userid int(10) DEFAULT '0' NOT NULL,
-   msg_time int(10) DEFAULT '0' NOT NULL,
-   poster_ip varchar(8),
-   msg_status int(10) DEFAULT '0' NOT NULL,
-   msg_text text NOT NULL,
-   newmsg tinyint(4) DEFAULT '0' NOT NULL,
-   PRIMARY KEY (msg_id),
-   KEY to_userid (to_userid)
+   privmsgs_id int(11) NOT NULL auto_increment,
+   privmsgs_type tinyint(4) DEFAULT '0' NOT NULL,
+   privmsgs_subject varchar(255) DEFAULT '0' NOT NULL,
+   privmsgs_from_groupid int(11) DEFAULT '0' NOT NULL,
+   privmsgs_to_groupid int(11) DEFAULT '0' NOT NULL,
+   privmsgs_date int(11) DEFAULT '0' NOT NULL,
+   privmsgs_ip varchar(8) NOT NULL,
+   privmsgs_bbcode_uid int(11) DEFAULT '0' NOT NULL,
+   PRIMARY KEY (privmsgs_id),
+   KEY privmsgs_from_groupid (privmsgs_from_groupid),
+   KEY privmsgs_to_groupid (privmsgs_to_groupid)
+);
+
+
+# --------------------------------------------------------
+#
+# Table structure for table 'phpbb_privmsgs_text'
+#
+
+DROP TABLE IF EXISTS phpbb_privmsgs_text;
+CREATE TABLE phpbb_privmsgs_text (
+   privmsgs_text_id int(11) DEFAULT '0' NOT NULL,
+   privmsgs_text text,
+   PRIMARY KEY (privmsgs_text_id)
 );
 
 
diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql
index 0adaea7674..c3979e9b9a 100644
--- a/phpBB/db/postgres_schema.sql
+++ b/phpBB/db/postgres_schema.sql
@@ -253,24 +253,34 @@ CREATE TABLE phpbb_posts_text (
    post_text text,
    CONSTRAINT phpbb_posts_text_pkey PRIMARY KEY (post_id)
 );
-CREATE  INDEX post_id_phpbb_posts_text_index ON phpbb_posts_text (post_id);
 
 
 /* --------------------------------------------------------
   Table structure for table phpbb_privmsgs
 -------------------------------------------------------- */
 CREATE TABLE phpbb_privmsgs (
-   msg_id int4 DEFAULT nextval('phpbb_privmsgs_id_seq'::text) NOT NULL,
-   from_userid int4 DEFAULT '0' NOT NULL,
-   to_userid int4 DEFAULT '0' NOT NULL,
-   msg_time int4 DEFAULT '0' NOT NULL,
-   poster_ip varchar(8),
-   msg_status int4 DEFAULT '0' NOT NULL,
-   msg_text text NOT NULL,
-   newmsg int2 DEFAULT '0' NOT NULL,
-   CONSTRAINT phpbb_privmsgs_pkey PRIMARY KEY (msg_id)
+   privmsgs_id int4 DEFAULT nextval('phpbb_privmsgs_id_seq'::text) NOT NULL,
+   privmsgs_type int2 DEFAULT '0' NOT NULL,
+   privmsgs_subject varchar(255) DEFAULT '0' NOT NULL,
+   privmsgs_from_groupid int4 DEFAULT '0' NOT NULL,
+   privmsgs_to_groupid int4 DEFAULT '0' NOT NULL,
+   privmsgs_date int4 DEFAULT '0' NOT NULL,
+   privmsgs_ip varchar(8) NOT NULL,
+   privmsgs_bbcode_uid int4 DEFAULT '0' NOT NULL,
+   CONSTRAINT phpbb_privmsgs_pkey PRIMARY KEY (privmsgs_id)
+);
+CREATE  INDEX privmsgs_from_groupid_phpbb_privmsgs_index ON phpbb_privmsgs (privmsgs_from_groupid);
+CREATE  INDEX privmsgs_to_groupid_phpbb_privmsgs_index ON phpbb_privmsgs (privmsgs_to_groupid);
+
+
+/* --------------------------------------------------------
+  Table structure for table phpbb_privmsgs_text
+-------------------------------------------------------- */
+CREATE TABLE phpbb_privmsgs_text (
+   privmsgs_text_id int4 DEFAULT '0' NOT NULL,
+   privmsgs_text text,
+   CONSTRAINT phpbb_privmsgs_text_pkey PRIMARY KEY (privmsgs_text_id)
 );
-CREATE  INDEX to_userid_phpbb_privmsgs_index ON phpbb_privmsgs (to_userid);
 
 
 /* --------------------------------------------------------