From 4c84ddade7c954a7ad6f0404180d83d31f939974 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 25 Apr 2008 04:12:45 -0400
Subject: [PATCH] - removed redundant code

---
 SQL/postgres.initial.sql |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
old mode 100755
new mode 100644
index 55e1396..05c6192
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -25,6 +25,8 @@
     preferences text DEFAULT ''::text NOT NULL
 );
 
+CREATE INDEX users_username_id_idx ON users (username);
+CREATE INDEX users_alias_id_idx ON users (alias);
 
   
 --
@@ -36,7 +38,7 @@
     sess_id character varying(40) DEFAULT ''::character varying PRIMARY KEY,
     created timestamp with time zone DEFAULT now() NOT NULL,
     changed timestamp with time zone DEFAULT now() NOT NULL,
-    ip character varying(16) NOT NULL,
+    ip character varying(41) NOT NULL,
     vars text NOT NULL
 );
 
@@ -61,7 +63,7 @@
 
 CREATE TABLE identities (
     identity_id integer DEFAULT nextval('identity_ids'::text) PRIMARY KEY,
-    user_id integer NOT NULL REFERENCES users (user_id),
+    user_id integer NOT NULL REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     del integer DEFAULT 0 NOT NULL,
     standard integer DEFAULT 0 NOT NULL,
     name character varying(128) NOT NULL,
@@ -69,9 +71,11 @@
     email character varying(128) NOT NULL,
     "reply-to" character varying(128),
     bcc character varying(128),
-    signature text
+    signature text,
+    html_signature integer DEFAULT 0 NOT NULL
 );
 
+CREATE INDEX identities_user_id_idx ON identities (user_id);
 
 
 --
@@ -93,7 +97,7 @@
 
 CREATE TABLE contacts (
     contact_id integer DEFAULT nextval('contact_ids'::text) PRIMARY KEY,
-    user_id integer NOT NULL REFERENCES users (user_id),
+    user_id integer NOT NULL REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     changed timestamp with time zone DEFAULT now() NOT NULL,
     del integer DEFAULT 0 NOT NULL,
     name character varying(128) DEFAULT ''::character varying NOT NULL,
@@ -103,7 +107,7 @@
     vcard text
 );
 
-
+CREATE INDEX contacts_user_id_idx ON contacts (user_id);
 
 --
 -- Sequence "cache_ids"
@@ -123,14 +127,14 @@
 
 CREATE TABLE "cache" (
     cache_id integer DEFAULT nextval('cache_ids'::text) PRIMARY KEY,
-    user_id integer NOT NULL REFERENCES users (user_id),
+    user_id integer NOT NULL REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     session_id character varying(40) REFERENCES "session" (sess_id),
     cache_key character varying(128) DEFAULT ''::character varying NOT NULL,
     created timestamp with time zone DEFAULT now() NOT NULL,
     data text NOT NULL
 );
 
-
+CREATE INDEX cache_user_id_idx ON "cache" (user_id, cache_key);
 
 --
 -- Sequence "message_ids"
@@ -150,7 +154,7 @@
 
 CREATE TABLE "messages" (
     message_id integer DEFAULT nextval('message_ids'::text) PRIMARY KEY,
-    user_id integer NOT NULL REFERENCES users (user_id),
+    user_id integer NOT NULL REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     del integer DEFAULT 0 NOT NULL,
     cache_key character varying(128) DEFAULT ''::character varying NOT NULL,
     created timestamp with time zone DEFAULT now() NOT NULL,
@@ -163,6 +167,7 @@
     date timestamp with time zone NOT NULL,
     size integer DEFAULT 0 NOT NULL,
     headers text NOT NULL,
-    body text
+    structure text
 );
 
+ALTER TABLE "messages" ADD UNIQUE (user_id, cache_key, uid);

--
Gitblit v1.9.1