From 6ccd45a13a259b917ec71feaf6865840b3357b13 Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Fri, 01 Feb 2008 20:59:52 -0500
Subject: [PATCH] * cleaned up CS (confusion in #1484467) * simplyfied lots of if-else structures
---
SQL/postgres.initial.sql | 271 +++++++++++++++++++++--------------------------------
1 files changed, 109 insertions(+), 162 deletions(-)
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
old mode 100755
new mode 100644
index 4e74a22..356a579
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -1,10 +1,21 @@
--
+-- Sequence "user_ids"
+-- Name: user_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+CREATE SEQUENCE user_ids
+ INCREMENT BY 1
+ NO MAXVALUE
+ 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) NOT NULL,
+ 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,
@@ -15,174 +26,20 @@
);
-
+
--
-- Table "session"
-- Name: session; Type: TABLE; Schema: public; Owner: postgres
--
CREATE TABLE "session" (
- sess_id character varying(40) DEFAULT ''::character varying NOT NULL,
+ 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
);
-
-
---
--- Table "identities"
--- Name: identities; Type: TABLE; Schema: public; Owner: postgres
---
-
-CREATE TABLE identities (
- identity_id integer DEFAULT nextval('identity_ids'::text) NOT NULL,
- user_id integer DEFAULT 0 NOT NULL,
- 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) NOT NULL,
- user_id integer DEFAULT 0 NOT NULL,
- 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) NOT NULL,
- user_id integer DEFAULT 0 NOT NULL,
- session_id character varying(40),
- 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" (
- message_id integer DEFAULT nextval('message_ids'::text) NOT NULL,
- user_id integer DEFAULT 0 NOT NULL,
- del integer DEFAULT 0 NOT NULL,
- cache_key character varying(128) DEFAULT ''::character varying 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,
- date timestamp with time zone NOT NULL,
- size integer DEFAULT 0 NOT NULL,
- headers text NOT NULL,
- body text
-);
-
-
-
---
--- Add primary keys
---
-
-ALTER TABLE ONLY "cache"
- ADD CONSTRAINT cache_pkey PRIMARY KEY (cache_id);
-
-
-ALTER TABLE ONLY "contacts"
- ADD CONSTRAINT contacts_pkey PRIMARY KEY (contact_id);
-
-
-ALTER TABLE ONLY identities
- ADD CONSTRAINT identities_pkey PRIMARY KEY (identity_id);
-
-
-ALTER TABLE ONLY "session"
- ADD CONSTRAINT session_pkey PRIMARY KEY (sess_id);
-
-
-ALTER TABLE ONLY "users"
- ADD CONSTRAINT users_pkey PRIMARY KEY (user_id);
-
-
-ALTER TABLE ONLY "messages"
- ADD CONSTRAINT messages_pkey PRIMARY KEY (message_id);
-
-
---
--- Reference keys
---
-
-ALTER TABLE ONLY "cache"
- ADD CONSTRAINT "$1" FOREIGN KEY (user_id) REFERENCES users(user_id);
-
-ALTER TABLE ONLY "cache"
- ADD CONSTRAINT "$2" FOREIGN KEY (session_id) REFERENCES "session"(sess_id);
-
-
-ALTER TABLE ONLY "contacts"
- ADD CONSTRAINT "$1" FOREIGN KEY (user_id) REFERENCES users(user_id);
-
-
-ALTER TABLE ONLY "identities"
- ADD CONSTRAINT "$1" FOREIGN KEY (user_id) REFERENCES users(user_id);
-
-
-ALTER TABLE ONLY "messages"
- ADD CONSTRAINT "$1" FOREIGN KEY (user_id) REFERENCES users(user_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;
-
-
---
--- 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;
--
@@ -197,17 +54,83 @@
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),
+ 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,
+ html_signature integer DEFAULT 0 NOT NULL
+);
+
+
+
+--
+-- 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),
+ 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
+);
+
+
+
+--
+-- 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),
+ 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
+);
+
--
@@ -221,3 +144,27 @@
NO MINVALUE
CACHE 1;
+--
+-- Table "messages"
+-- Name: messages; Type: TABLE; Schema: public; Owner: postgres
+--
+
+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,
+ 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,
+ date timestamp with time zone NOT NULL,
+ size integer DEFAULT 0 NOT NULL,
+ headers text NOT NULL,
+ structure text
+);
+
+ALTER TABLE "messages" ADD UNIQUE (user_id, cache_key, uid);
--
Gitblit v1.9.1