Changeset 122 for trunk/sql

Timestamp:

04/11/06 23:12:37 (3 years ago)

Author:

michiel

Message:

merged from rev 119 in branches/mvblog-1_6

Files:

• trunk/sql/mvblog.sql (modified) (18 diffs)

trunk/sql/mvblog.sql

@@ -3 +3 @@
 --
 
-SET client_encoding = 'SQL_ASCII';
+SET client_encoding = 'LATIN1';
 SET check_function_bodies = false;
 
@@ -21 +21 @@
 SET search_path = public, pg_catalog;
 
+--
+-- TOC entry 5 (OID 626108)
 -- Name: acronyms; Type: TABLE; Schema: public; Owner: mvblog
+--
 
 CREATE TABLE acronyms (
@@ -29 +32 @@
 );
 
---
--- TOC entry 5 (OID 909338)
+
+--
+-- TOC entry 6 (OID 626116)
 -- Name: authors; Type: TABLE; Schema: public; Owner: mvblog
 --
@@ -40 +44 @@
     email character varying(255),
     fullname character varying(255),
-    active smallint DEFAULT 1
-);
-
-
---
--- TOC entry 6 (OID 909343)
+    active smallint DEFAULT 1,
+    website character varying(255)
+);
+
+
+--
+-- TOC entry 7 (OID 626122)
 -- Name: categories; Type: TABLE; Schema: public; Owner: mvblog
 --
@@ -59 +64 @@
 
 --
--- TOC entry 7 (OID 909351)
+-- TOC entry 8 (OID 626130)
 -- Name: articles; Type: TABLE; Schema: public; Owner: mvblog
 --
@@ -77 +82 @@
     modified_by integer,
     ping_sent smallint,
-    tb_uri character varying(255)
-);
-
-
---
--- TOC entry 8 (OID 909359)
+    tb_uri character varying(255),
+    aside smallint DEFAULT 0
+);
+
+
+--
+-- TOC entry 9 (OID 626138)
 -- Name: settings; Type: TABLE; Schema: public; Owner: mvblog
 --
@@ -94 +100 @@
 
 --
--- TOC entry 9 (OID 909367)
+-- TOC entry 10 (OID 626146)
 -- Name: comments; Type: TABLE; Schema: public; Owner: mvblog
 --
@@ -106 +112 @@
     date integer NOT NULL,
     articles_id integer NOT NULL,
-    title character varying(255)
-);
-
+    title character varying(255),
+    deleted integer DEFAULT 0,
+    ip character varying(255)
+);
+
+
+--
+-- TOC entry 11 (OID 626265)
+-- Name: menulinks; Type: TABLE; Schema: public; Owner: mvblog
+--
+
+CREATE TABLE menulinks (
+    id serial NOT NULL,
+    url character varying,
+    linktitle text,
+    image character varying,
+    sortorder integer
+);
+
+
+--
+-- Data for TOC entry 26 (OID 626108)
 -- Name: acronyms; Type: TABLE DATA; Schema: public; Owner: mvblog
+--
 
 COPY acronyms (id, acronym, description) FROM stdin;
@@ -210 +236 @@
 
 --
--- Data for TOC entry 20 (OID 909338)
+-- Data for TOC entry 27 (OID 626116)
 -- Name: authors; Type: TABLE DATA; Schema: public; Owner: mvblog
 --
 
-COPY authors (id, login, "password", email, fullname, active) FROM stdin;
-1       mvblog  mvblog  mvblog@example.com      MvBlog default user     1
-\.
-
-
---
--- Data for TOC entry 21 (OID 909343)
+COPY authors (id, login, "password", email, fullname, active, website) FROM stdin;
+1       mvblog  mvblog  mvblog@example.com      MvBlog default user     1       www.mvblog.org
+\.
+
+
+--
+-- Data for TOC entry 28 (OID 626122)
 -- Name: categories; Type: TABLE DATA; Schema: public; Owner: mvblog
 --
@@ -229 +255 @@
 
 --
--- Data for TOC entry 22 (OID 909351)
+-- Data for TOC entry 29 (OID 626130)
 -- Name: articles; Type: TABLE DATA; Schema: public; Owner: mvblog
 --
 
-COPY articles (id, date, title, head, body, categories_id, authors_id, active, public, mail_comments, last_modified, modified_by, ping_sent, tb_uri) FROM stdin;
-\.
-
-
---
--- Data for TOC entry 23 (OID 909359)
+COPY articles (id, date, title, head, body, categories_id, authors_id, active, public, mail_comments, last_modified, modified_by, ping_sent, tb_uri, aside) FROM stdin;
+\.
+
+
+--
+-- Data for TOC entry 30 (OID 626138)
 -- Name: settings; Type: TABLE DATA; Schema: public; Owner: mvblog
 --
@@ -247 +273 @@
 
 --
--- Data for TOC entry 24 (OID 909367)
+-- Data for TOC entry 31 (OID 626146)
 -- Name: comments; Type: TABLE DATA; Schema: public; Owner: mvblog
 --
 
-COPY comments (id, name, email, website, "comment", date, articles_id, title) FROM stdin;
-\.
-
-
+COPY comments (id, name, email, website, "comment", date, articles_id, title, deleted, ip) FROM stdin;
+\.
+
+
+--
+-- Data for TOC entry 32 (OID 626265)
+-- Name: menulinks; Type: TABLE DATA; Schema: public; Owner: mvblog
+--
+
+COPY menulinks (id, url, linktitle, image, sortorder) FROM stdin;
+\.
+
+
+--
+-- TOC entry 19 (OID 626247)
 -- Name: acronyms_pkey; Type: CONSTRAINT; Schema: public; Owner: mvblog
+--
 
 ALTER TABLE ONLY acronyms
     ADD CONSTRAINT acronyms_pkey PRIMARY KEY (id);
 
---
--- TOC entry 15 (OID 909374)
+
+--
+-- TOC entry 20 (OID 626249)
 -- Name: authors_pkey; Type: CONSTRAINT; Schema: public; Owner: mvblog
 --
@@ -270 +309 @@
 
 --
--- TOC entry 16 (OID 909376)
+-- TOC entry 21 (OID 626251)
 -- Name: categories_pkey; Type: CONSTRAINT; Schema: public; Owner: mvblog
 --
@@ -279 +318 @@
 
 --
--- TOC entry 18 (OID 909378)
+-- TOC entry 23 (OID 626253)
 -- Name: settings_pkey; Type: CONSTRAINT; Schema: public; Owner: mvblog
 --
@@ -288 +327 @@
 
 --
--- TOC entry 17 (OID 909380)
+-- TOC entry 22 (OID 626255)
 -- Name: articles_pkey; Type: CONSTRAINT; Schema: public; Owner: mvblog
 --
@@ -297 +336 @@
 
 --
--- TOC entry 19 (OID 909382)
+-- TOC entry 24 (OID 626257)
 -- Name: comments_pkey; Type: CONSTRAINT; Schema: public; Owner: mvblog
 --
@@ -305 +344 @@
 
 
+--
+-- TOC entry 25 (OID 626271)
+-- Name: menulinks_pkey; Type: CONSTRAINT; Schema: public; Owner: mvblog
+--
+
+ALTER TABLE ONLY menulinks
+    ADD CONSTRAINT menulinks_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 12 (OID 626106)
 -- Name: acronyms_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mvblog
+--
 
 SELECT pg_catalog.setval('acronyms_id_seq', 94, true);
 
---
--- TOC entry 10 (OID 909336)
+
+--
+-- TOC entry 13 (OID 626114)
 -- Name: authors_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mvblog
 --
@@ -318 +370 @@
 
 --
--- TOC entry 11 (OID 909341)
+-- TOC entry 14 (OID 626120)
 -- Name: categories_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mvblog
 --
 
-SELECT pg_catalog.setval('categories_id_seq', 1, true);
-
-
---
--- TOC entry 12 (OID 909349)
+SELECT pg_catalog.setval('categories_id_seq', 2, true);
+
+
+--
+-- TOC entry 15 (OID 626128)
 -- Name: articles_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mvblog
 --
 
-SELECT pg_catalog.setval('articles_id_seq', 1, true);
-
-
---
--- TOC entry 13 (OID 909357)
+SELECT pg_catalog.setval('articles_id_seq', 2, true);
+
+
+--
+-- TOC entry 16 (OID 626136)
 -- Name: settings_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mvblog
 --
@@ -342 +394 @@
 
 --
--- TOC entry 14 (OID 909365)
+-- TOC entry 17 (OID 626144)
 -- Name: comments_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mvblog
 --
 
 SELECT pg_catalog.setval('comments_id_seq', 1, true);
+
+
+--
+-- TOC entry 18 (OID 626263)
+-- Name: menulinks_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mvblog
+--
+
+SELECT pg_catalog.setval('menulinks_id_seq', 1, false);