From 6c95809d10fda20d522a6a09b861f20bed43ee8c Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Mon, 30 Nov 2009 06:55:33 -0500 Subject: [PATCH] - don't warn about lack of plugin's config file, it's absolutely optional --- SQL/postgres.initial.sql | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-) diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql old mode 100755 new mode 100644 index 55e1396..a52a01f --- a/SQL/postgres.initial.sql +++ b/SQL/postgres.initial.sql @@ -1,3 +1,5 @@ +-- RoundCube Webmail initial database structure + -- -- Sequence "user_ids" -- Name: user_ids; Type: SEQUENCE; Schema: public; Owner: postgres @@ -21,10 +23,12 @@ alias character varying(128) DEFAULT ''::character varying NOT NULL, created timestamp with time zone DEFAULT now() NOT NULL, last_login timestamp with time zone DEFAULT now() NOT NULL, - "language" character varying(5) DEFAULT 'en'::character varying NOT NULL, + "language" character varying(5), 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,10 +40,11 @@ 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 ); +CREATE INDEX session_changed_idx ON session (changed); -- @@ -61,17 +66,19 @@ CREATE TABLE identities ( identity_id integer DEFAULT nextval('identity_ids'::text) PRIMARY KEY, - user_id integer NOT NULL REFERENCES users (user_id), - del integer DEFAULT 0 NOT NULL, - standard integer DEFAULT 0 NOT NULL, + user_id integer NOT NULL REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE, + del smallint DEFAULT 0 NOT NULL, + standard smallint DEFAULT 0 NOT NULL, name character varying(128) NOT NULL, organization character varying(128), 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,9 +100,9 @@ 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, + del smallint DEFAULT 0 NOT NULL, name character varying(128) DEFAULT ''::character varying NOT NULL, email character varying(128) DEFAULT ''::character varying NOT NULL, firstname character varying(128) DEFAULT ''::character varying NOT NULL, @@ -103,7 +110,7 @@ vcard text ); - +CREATE INDEX contacts_user_id_idx ON contacts (user_id, email); -- -- Sequence "cache_ids" @@ -123,14 +130,14 @@ CREATE TABLE "cache" ( cache_id integer DEFAULT nextval('cache_ids'::text) PRIMARY KEY, - user_id integer NOT NULL REFERENCES users (user_id), - session_id character varying(40) REFERENCES "session" (sess_id), + user_id integer NOT NULL REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE, 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); +CREATE INDEX cache_created_idx ON "cache" (created); -- -- Sequence "message_ids" @@ -148,10 +155,10 @@ -- Name: messages; Type: TABLE; Schema: public; Owner: postgres -- -CREATE TABLE "messages" ( +CREATE TABLE messages ( message_id integer DEFAULT nextval('message_ids'::text) PRIMARY KEY, - user_id integer NOT NULL REFERENCES users (user_id), - del integer DEFAULT 0 NOT NULL, + user_id integer NOT NULL REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE, + del smallint DEFAULT 0 NOT NULL, cache_key character varying(128) DEFAULT ''::character varying NOT NULL, created timestamp with time zone DEFAULT now() NOT NULL, idx integer DEFAULT 0 NOT NULL, @@ -163,6 +170,9 @@ 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); +CREATE INDEX messages_index_idx ON messages (user_id, cache_key, idx); +CREATE INDEX messages_created_idx ON messages (created); -- Gitblit v1.9.1