From 445a4ca04dfcd255f9d89ee76757b04c2d87bbfc Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 13 May 2011 13:51:28 -0400
Subject: [PATCH] Fix empty name in search results and error when creating a new contact
---
SQL/postgres.initial.sql | 282 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 168 insertions(+), 114 deletions(-)
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
old mode 100755
new mode 100644
index b251755..5350e79
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -1,27 +1,50 @@
+-- Roundcube Webmail initial database structure
--
--- Sequence "cache_ids"
--- Name: cache_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+-- Sequence "user_ids"
+-- Name: user_ids; Type: SEQUENCE; Schema: public; Owner: postgres
--
-CREATE SEQUENCE cache_ids
+CREATE SEQUENCE user_ids
INCREMENT BY 1
NO MAXVALUE
NO MINVALUE
CACHE 1;
-
--
--- Sequence "contact_ids"
--- Name: contact_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+-- Table "users"
+-- Name: users; Type: TABLE; Schema: public; Owner: postgres
--
-CREATE SEQUENCE contact_ids
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE TABLE users (
+ user_id integer DEFAULT nextval('user_ids'::text) PRIMARY KEY,
+ username varchar(128) DEFAULT '' NOT NULL,
+ mail_host varchar(128) DEFAULT '' NOT NULL,
+ alias varchar(128) DEFAULT '' NOT NULL,
+ created timestamp with time zone DEFAULT now() NOT NULL,
+ last_login timestamp with time zone DEFAULT NULL,
+ "language" varchar(5),
+ preferences text DEFAULT ''::text NOT NULL,
+ CONSTRAINT users_username_key UNIQUE (username, mail_host)
+);
+
+CREATE INDEX users_alias_id_idx ON users (alias);
+
+
+--
+-- Table "session"
+-- Name: session; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE "session" (
+ sess_id varchar(40) DEFAULT '' PRIMARY KEY,
+ created timestamp with time zone DEFAULT now() NOT NULL,
+ changed timestamp with time zone DEFAULT now() NOT NULL,
+ ip varchar(41) NOT NULL,
+ vars text NOT NULL
+);
+
+CREATE INDEX session_changed_idx ON session (changed);
--
@@ -36,18 +59,133 @@
NO MINVALUE
CACHE 1;
-
--
--- Sequence "user_ids"
--- Name: user_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+-- Table "identities"
+-- Name: identities; Type: TABLE; Schema: public; Owner: postgres
--
-CREATE SEQUENCE user_ids
+CREATE TABLE identities (
+ identity_id integer DEFAULT nextval('identity_ids'::text) PRIMARY KEY,
+ 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 smallint DEFAULT 0 NOT NULL,
+ standard smallint DEFAULT 0 NOT NULL,
+ name varchar(128) NOT NULL,
+ organization varchar(128),
+ email varchar(128) NOT NULL,
+ "reply-to" varchar(128),
+ bcc varchar(128),
+ signature text,
+ html_signature integer DEFAULT 0 NOT NULL
+);
+
+CREATE INDEX identities_user_id_idx ON identities (user_id, del);
+
+
+--
+-- Sequence "contact_ids"
+-- Name: contact_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+CREATE SEQUENCE contact_ids
+ START WITH 1
INCREMENT BY 1
NO MAXVALUE
NO MINVALUE
CACHE 1;
+--
+-- Table "contacts"
+-- Name: contacts; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE contacts (
+ contact_id integer DEFAULT nextval('contact_ids'::text) PRIMARY KEY,
+ 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 smallint DEFAULT 0 NOT NULL,
+ name varchar(128) DEFAULT '' NOT NULL,
+ email varchar(255) DEFAULT '' NOT NULL,
+ firstname varchar(128) DEFAULT '' NOT NULL,
+ surname varchar(128) DEFAULT '' NOT NULL,
+ vcard text,
+ words text
+);
+
+CREATE INDEX contacts_user_id_idx ON contacts (user_id, email);
+
+--
+-- Sequence "contactgroups_ids"
+-- Name: contactgroups_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+CREATE SEQUENCE contactgroups_ids
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+
+--
+-- Table "contactgroups"
+-- Name: contactgroups; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE contactgroups (
+ contactgroup_id integer DEFAULT nextval('contactgroups_ids'::text) PRIMARY KEY,
+ 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 smallint NOT NULL DEFAULT 0,
+ name varchar(128) NOT NULL DEFAULT ''
+);
+
+CREATE INDEX contactgroups_user_id_idx ON contactgroups (user_id, del);
+
+--
+-- Table "contactgroupmembers"
+-- Name: contactgroupmembers; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE contactgroupmembers (
+ contactgroup_id integer NOT NULL
+ REFERENCES contactgroups(contactgroup_id) ON DELETE CASCADE ON UPDATE CASCADE,
+ contact_id integer NOT NULL
+ REFERENCES contacts(contact_id) ON DELETE CASCADE ON UPDATE CASCADE,
+ created timestamp with time zone DEFAULT now() NOT NULL,
+ PRIMARY KEY (contactgroup_id, contact_id)
+);
+
+CREATE INDEX contactgroupmembers_contact_id_idx ON contactgroupmembers (contact_id);
+
+--
+-- Sequence "cache_ids"
+-- Name: cache_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+CREATE SEQUENCE cache_ids
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+
+--
+-- Table "cache"
+-- Name: cache; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE "cache" (
+ cache_id integer DEFAULT nextval('cache_ids'::text) PRIMARY KEY,
+ user_id integer NOT NULL
+ REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+ cache_key varchar(128) DEFAULT '' 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"
@@ -60,114 +198,30 @@
NO MINVALUE
CACHE 1;
-
-
---
--- Table "users"
--- Name: users; Type: TABLE; Schema: public; Owner: postgres
---
-
-CREATE TABLE users (
- user_id integer DEFAULT nextval('user_ids'::text) PRIMARY KEY,
- username character varying(128) DEFAULT ''::character varying NOT NULL,
- mail_host character varying(128) DEFAULT ''::character varying NOT NULL,
- 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,
- preferences text DEFAULT ''::text NOT NULL
-);
-
-
-
---
--- Table "session"
--- Name: session; Type: TABLE; Schema: public; Owner: postgres
---
-
-CREATE TABLE "session" (
- 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,
- vars text NOT NULL
-);
-
-
-
---
--- Table "identities"
--- Name: identities; Type: TABLE; Schema: public; Owner: postgres
---
-
-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,
- 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
-);
-
-
---
--- Table "contacts"
--- Name: contacts; Type: TABLE; Schema: public; Owner: postgres
---
-
-CREATE TABLE contacts (
- contact_id integer DEFAULT nextval('contact_ids'::text) PRIMARY KEY,
- user_id integer NOT NULL REFERENCES users (user_id),
- changed timestamp with time zone DEFAULT now() NOT NULL,
- del integer 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,
- surname character varying(128) DEFAULT ''::character varying NOT NULL,
- vcard text
-);
-
-
-
---
--- Table "cache"
--- Name: cache; Type: TABLE; Schema: public; Owner: postgres
---
-
-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" (session_id),
- cache_key character varying(128) DEFAULT ''::character varying NOT NULL,
- created timestamp with time zone DEFAULT now() NOT NULL,
- data text NOT NULL
-);
-
-
-
--
-- Table "messages"
-- 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,
- cache_key character varying(128) DEFAULT ''::character varying 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 varchar(128) DEFAULT '' NOT NULL,
+ created timestamp with time zone DEFAULT now() NOT NULL,
idx integer DEFAULT 0 NOT NULL,
uid integer DEFAULT 0 NOT NULL,
- subject character varying(128) DEFAULT ''::character varying NOT NULL,
- "from" character varying(128) DEFAULT ''::character varying NOT NULL,
- "to" character varying(128) DEFAULT ''::character varying NOT NULL,
- cc character varying(128) DEFAULT ''::character varying NOT NULL,
+ subject varchar(128) DEFAULT '' NOT NULL,
+ "from" varchar(128) DEFAULT '' NOT NULL,
+ "to" varchar(128) DEFAULT '' NOT NULL,
+ cc varchar(128) DEFAULT '' NOT NULL,
date timestamp with time zone NOT NULL,
size integer DEFAULT 0 NOT NULL,
headers text NOT NULL,
- body text
+ structure text,
+ CONSTRAINT messages_user_id_key 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