Merge branch 'dev' into bs5

1 files changed, 0 insertions, 57 deletions

diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index c18cc087b..f3fe28f93 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -356,19 +356,6 @@ CREATE TABLE "config" (
   PRIMARY KEY ("id"),
   UNIQUE ("cat","k")
 );
-CREATE TABLE "conv" (
-  "id" serial  NOT NULL,
-  "guid" text NOT NULL,
-  "recips" text NOT NULL,
-  "uid" bigint NOT NULL,
-  "creator" text NOT NULL,
-  "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "subject" text NOT NULL,
-  PRIMARY KEY ("id")
-);
-create index "conv_created_idx" on conv ("created");
-create index "conv_updated_idx" on conv ("updated");
 
 CREATE TABLE IF NOT EXISTS "dreport" (
   "dreport_id" serial NOT NULL,
@@ -729,50 +716,6 @@ create index "target_id_idx" on listeners ("target_id");
 create index "portable_id_idx" on listeners ("portable_id");
 create index "ltype_idx" on listeners ("ltype");
 
-CREATE TABLE "mail" (
-  "id" serial  NOT NULL,
-  "convid" bigint  NOT NULL DEFAULT '0',
-  "conv_guid" text NOT NULL,
-  "mail_flags" bigint  NOT NULL DEFAULT '0',
-  "from_xchan" text NOT NULL DEFAULT '',
-  "to_xchan" text NOT NULL DEFAULT '',
-  "account_id" bigint  NOT NULL DEFAULT '0',
-  "channel_id" bigint  NOT NULL DEFAULT '0',
-  "mail_mimetype" varchar(64) NOT NULL DEFAULT '0',
-  "title" text NOT NULL,
-  "body" text NOT NULL,
-  "sig" text NOT NULL,
-  "attach" text NOT NULL DEFAULT '',
-  "mid" text NOT NULL,
-  "parent_mid" text NOT NULL,
-  "mail_deleted" smallint NOT NULL DEFAULT '0',
-  "mail_replied" smallint NOT NULL DEFAULT '0',
-  "mail_isreply" smallint NOT NULL DEFAULT '0',
-  "mail_seen" smallint NOT NULL DEFAULT '0',
-  "mail_recalled" smallint NOT NULL DEFAULT '0',
-  "mail_obscured" smallint NOT NULL DEFAULT '0',
-  "mail_raw" smallint NOT NULL DEFAULT '0',
-  "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  PRIMARY KEY ("id")
-);
-create index "mail_convid" on mail ("convid");
-create index "mail_conv_guid" on mail ("conv_guid");
-create index "mail_created" on mail ("created");
-create index "mail_flags" on mail ("mail_flags");
-create index "mail_account_id" on mail ("account_id");
-create index "mail_channel_id" on mail ("channel_id");
-create index "mail_from_xchan" on mail ("from_xchan");
-create index "mail_to_xchan" on mail ("to_xchan");
-create index "mail_mid" on mail ("mid");
-create index "mail_parent_mid" on mail ("parent_mid");
-create index "mail_expires" on mail ("expires");
-create index "mail_deleted" on mail ("mail_deleted");
-create index "mail_replied" on mail ("mail_replied");
-create index "mail_isreply" on mail ("mail_isreply");
-create index "mail_seen" on mail ("mail_seen");
-create index "mail_recalled" on mail ("mail_recalled");
-create index "mail_obscured" on mail ("mail_obscured");
 CREATE TABLE "menu" (
   "menu_id" serial  NOT NULL,
   "menu_channel_id" bigint  NOT NULL DEFAULT '0',