From a400bd781627ddbff21fac6738a270ae7bf26c0f Mon Sep 17 00:00:00 2001
From: david <>
Date: Sun, 17 Mar 2002 22:26:23 +0000
Subject: [PATCH] update for postgres 7.2 compatibility

---
 LDP/lampadas/database/audience.sql         |  5 --
 LDP/lampadas/database/createdb.sh          | 58 +++++++++++-----------
 LDP/lampadas/database/doc_vote.sql         |  2 +-
 LDP/lampadas/database/document.sql         |  1 +
 LDP/lampadas/database/document_topic.sql   |  5 --
 LDP/lampadas/database/document_wiki.sql    |  2 +-
 LDP/lampadas/database/maintainer_notes.sql |  2 +-
 LDP/lampadas/database/notes.sql            |  2 +-
 LDP/lampadas/database/username.sql         |  3 --
 9 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/LDP/lampadas/database/audience.sql b/LDP/lampadas/database/audience.sql
index 590499f0..3c26cab4 100644
--- a/LDP/lampadas/database/audience.sql
+++ b/LDP/lampadas/database/audience.sql
@@ -8,9 +8,4 @@ CREATE TABLE audience (
 	PRIMARY KEY (audience)	
 );
 
-INSERT INTO audience ( audience, audience_level, audience_description ) VALUES ('NOVICE', 1, 'Novice');
-INSERT INTO audience ( audience, audience_level, audience_description ) VALUES ('BEGINNER', 2, 'Beginners');
-INSERT INTO audience ( audience, audience_level, audience_description ) VALUES ('INTERMEDIATe', 3, 'Intermediate Users');
-INSERT INTO audience ( audience, audience_level, audience_description ) VALUES ('ADVANCED', 4, 'Advanced Users');
-
 GRANT SELECT ON audience TO "www-data";
diff --git a/LDP/lampadas/database/createdb.sh b/LDP/lampadas/database/createdb.sh
index 04e5960c..b3511490 100755
--- a/LDP/lampadas/database/createdb.sh
+++ b/LDP/lampadas/database/createdb.sh
@@ -1,45 +1,45 @@
 #~/bin/bash
 
 # lookup tables
-psql ldp -f class.sql
-psql ldp -f dtd.sql
-psql ldp -f format.sql
-psql ldp -f pub_status.sql
-psql ldp -f review_status.sql
-psql ldp -f role.sql
-psql ldp -f topic.sql
-psql ldp -f subtopic.sql
+psql ldp -qf class.sql
+psql ldp -qf dtd.sql
+psql ldp -qf format.sql
+psql ldp -qf pub_status.sql
+psql ldp -qf review_status.sql
+psql ldp -qf role.sql
+psql ldp -qf topic.sql
+psql ldp -qf subtopic.sql
 
-psql ldp -f document.sql
+psql ldp -qf document.sql
 
-psql ldp -f notes.sql
+psql ldp -qf notes.sql
 
-psql ldp -f document_wiki.sql
-psql ldp -f document_topic.sql
-psql ldp -f document_rev.sql
+psql ldp -qf document_wiki.sql
+psql ldp -qf document_topic.sql
+psql ldp -qf document_rev.sql
 
-psql ldp -f maintainer.sql
-psql ldp -f maintainer_notes.sql
-psql ldp -f document_maintainer.sql
+psql ldp -qf maintainer.sql
+psql ldp -qf maintainer_notes.sql
+psql ldp -qf document_maintainer.sql
 
-psql ldp -f editor.sql
-psql ldp -f editor_role.sql
-psql ldp -f document_editor.sql
+psql ldp -qf editor.sql
+psql ldp -qf editor_role.sql
+psql ldp -qf document_editor.sql
 
-psql ldp -f audience.sql
-psql ldp -f document_audience.sql
+psql ldp -qf audience.sql
+psql ldp -qf document_audience.sql
 
-psql ldp -f doc_vote.sql
+psql ldp -qf doc_vote.sql
 
-psql ldp -f stats.sql
-psql ldp -f stats_cdf.sql
+psql ldp -qf stats.sql
+psql ldp -qf stats_cdf.sql
 
-psql ldp -f license.sql
+psql ldp -qf license.sql
 
-psql ldp -f volunteer.sql
+psql ldp -qf volunteer.sql
 
-psql ldp -f username.sql
+psql ldp -qf username.sql
 
 #views
-psql ldp -f vw_gfdl_emails.sql
-psql ldp -f vw_gfdl_docs.sql
+psql ldp -qf vw_gfdl_emails.sql
+psql ldp -qf vw_gfdl_docs.sql
diff --git a/LDP/lampadas/database/doc_vote.sql b/LDP/lampadas/database/doc_vote.sql
index f0e08de7..b63ae8b1 100644
--- a/LDP/lampadas/database/doc_vote.sql
+++ b/LDP/lampadas/database/doc_vote.sql
@@ -4,7 +4,7 @@ CREATE TABLE doc_vote
 (
 	doc_id		INT4		NOT NULL,
 	username	CHAR(12)	NOT NULL,
-	date_entered	TIMESTAMP	NOT NULL DEFAULT timestamp(date 'today'),
+	date_entered	TIMESTAMP	NOT NULL DEFAULT now(),
 	vote		INT4		NOT NULL,
 
 	PRIMARY KEY (doc_id, username)
diff --git a/LDP/lampadas/database/document.sql b/LDP/lampadas/database/document.sql
index d7adb113..a7c7548c 100644
--- a/LDP/lampadas/database/document.sql
+++ b/LDP/lampadas/database/document.sql
@@ -24,6 +24,7 @@ CREATE TABLE document
 	license_id		INT4,
 	license			CHAR(12),
 	abstract		TEXT,
+	wiki			TEXT,
 	rating			REAL,
 
 	PRIMARY KEY (doc_id)
diff --git a/LDP/lampadas/database/document_topic.sql b/LDP/lampadas/database/document_topic.sql
index 19a262a6..173e4574 100644
--- a/LDP/lampadas/database/document_topic.sql
+++ b/LDP/lampadas/database/document_topic.sql
@@ -19,9 +19,4 @@ ADD CONSTRAINT topic_num_fk
 FOREIGN KEY (topic_num)
 REFERENCES topic(topic_num);
 
-#ALTER TABLE document_topic
-#ADD CONSTRAINT subtopic_num_fk
-#FOREIGN KEY (subtopic_num)
-#REFERENCES subtopic(subtopic_num);
-
 GRANT ALL ON document_topic TO "www-data";
diff --git a/LDP/lampadas/database/document_wiki.sql b/LDP/lampadas/database/document_wiki.sql
index f114f09e..231d1f6c 100644
--- a/LDP/lampadas/database/document_wiki.sql
+++ b/LDP/lampadas/database/document_wiki.sql
@@ -3,7 +3,7 @@ DROP TABLE document_wiki;
 CREATE TABLE document_wiki (
 	doc_id		INT4	NOT NULL,
 	revision	INT4	NOT NULL,
-	date_entered	TIMESTAMP NOT NULL DEFAULT timestamp(date 'today'),
+	date_entered	TIMESTAMP NOT NULL DEFAULT now(),
 	wiki		TEXT,
 	notes		CHAR(256),
 	username	CHAR(12)
diff --git a/LDP/lampadas/database/maintainer_notes.sql b/LDP/lampadas/database/maintainer_notes.sql
index c2a2ed8e..e5e13d89 100644
--- a/LDP/lampadas/database/maintainer_notes.sql
+++ b/LDP/lampadas/database/maintainer_notes.sql
@@ -2,7 +2,7 @@ DROP TABLE maintainer_notes;
 
 CREATE TABLE maintainer_notes (
 	maintainer_id	INT4	NOT NULL,
-	date_entered	TIMESTAMP NOT NULL DEFAULT timestamp(date 'today'),
+	date_entered	TIMESTAMP NOT NULL DEFAULT now(),
 	notes		TEXT,
 	username	CHAR(12)
 );
diff --git a/LDP/lampadas/database/notes.sql b/LDP/lampadas/database/notes.sql
index f0eaecc7..825a58b1 100644
--- a/LDP/lampadas/database/notes.sql
+++ b/LDP/lampadas/database/notes.sql
@@ -2,7 +2,7 @@ DROP TABLE notes;
 
 CREATE TABLE notes (
 	doc_id		INT4	NOT NULL,
-	date_entered	TIMESTAMP NOT NULL DEFAULT timestamp(date 'today'),
+	date_entered	TIMESTAMP NOT NULL DEFAULT now(),
 	notes		TEXT,
 	username	CHAR(12)
 );
diff --git a/LDP/lampadas/database/username.sql b/LDP/lampadas/database/username.sql
index bee10e88..e907ee7c 100644
--- a/LDP/lampadas/database/username.sql
+++ b/LDP/lampadas/database/username.sql
@@ -14,6 +14,3 @@ CREATE TABLE username (
 
 GRANT ALL ON username TO "www-data";
 GRANT SELECT ON username TO root;
-
-INSERT INTO username(username, first_name, surname, maintainer_id, email, admin)
-	VALUES ('david', 'David', 'Merrill', 254, 'david@lupercalia.net', 't');