From: paca70 <paca70>
Date: Fri, 24 Sep 2004 07:49:40 +0000 (+0000)
Subject: Fixes for new postgres database creation
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=55bcf883c363d4242e0110a215468735c2ff2219;p=moodle.git

Fixes for new postgres database creation
---

diff --git a/mod/quiz/db/postgres7.sql b/mod/quiz/db/postgres7.sql
index 6949b8f963..d19dae6e37 100644
--- a/mod/quiz/db/postgres7.sql
+++ b/mod/quiz/db/postgres7.sql
@@ -256,7 +256,7 @@ CREATE TABLE prefix_quiz_attemptonlast_datasets (
     category INT8  NOT NULL default '0',
     userid INT8  NOT NULL default '0',
     datasetnumber INT8  NOT NULL default '0',
-    CONSTRAINT  category UNIQUE (category,userid)
+    CONSTRAINT  prefix_quiz_category_userid_unique UNIQUE (category,userid)
 );
 
 CREATE TABLE prefix_quiz_dataset_definitions (
diff --git a/mod/wiki/db/postgres7.sql b/mod/wiki/db/postgres7.sql
index 47b0a9931f..4f66660cda 100644
--- a/mod/wiki/db/postgres7.sql
+++ b/mod/wiki/db/postgres7.sql
@@ -56,6 +56,6 @@ CREATE TABLE prefix_wiki_pages (
 ) ;
 
 ALTER TABLE ONLY prefix_wiki_pages
-    ADD CONSTRAINT id PRIMARY KEY (pagename, version, wiki);
+    ADD CONSTRAINT prefix_wiki_pages_pagename_version_wiki_unique PRIMARY KEY (pagename, version, wiki);
 
 CREATE INDEX prefix_wiki_pages_pagename_version_wiki_idx ON prefix_wiki_pages (pagename, version, wiki) ;
diff --git a/mod/workshop/db/postgres7.sql b/mod/workshop/db/postgres7.sql
index 9095a0a802..32ca994d63 100644
--- a/mod/workshop/db/postgres7.sql
+++ b/mod/workshop/db/postgres7.sql
@@ -26,7 +26,7 @@ CREATE TABLE prefix_workshop (
   overallocation INT  NOT NULL default '0',
   timemodified INT8  NOT NULL default '0',
   teacherweight INT  NOT NULL default '1',
-  showleaguetable INT4 NOT NULL default '0',
+  showleaguetable INT4 NOT NULL default '0'
 );
 # --------------------------------------------------------
 
@@ -121,13 +121,13 @@ CREATE TABLE prefix_workshop_comments (
   comments text NOT NULL default ''
 );
 
-INSERT INTO `prefix_log_display` VALUES ('workshop', 'assessments', 'workshop', 'name');
-INSERT INTO `prefix_log_display` VALUES ('workshop', 'close', 'workshop', 'name');
-INSERT INTO `prefix_log_display` VALUES ('workshop', 'display', 'workshop', 'name');
-INSERT INTO `prefix_log_display` VALUES ('workshop', 'resubmit', 'workshop', 'name');
-INSERT INTO `prefix_log_display` VALUES ('workshop', 'set up', 'workshop', 'name');
-INSERT INTO `prefix_log_display` VALUES ('workshop', 'submissions', 'workshop', 'name');
-INSERT INTO `prefix_log_display` VALUES ('workshop', 'view', 'workshop', 'name');
-INSERT INTO `prefix_log_display` VALUES ('workshop', 'update', 'workshop', 'name');
+INSERT INTO prefix_log_display VALUES ('workshop', 'assessments', 'workshop', 'name');
+INSERT INTO prefix_log_display VALUES ('workshop', 'close', 'workshop', 'name');
+INSERT INTO prefix_log_display VALUES ('workshop', 'display', 'workshop', 'name');
+INSERT INTO prefix_log_display VALUES ('workshop', 'resubmit', 'workshop', 'name');
+INSERT INTO prefix_log_display VALUES ('workshop', 'set up', 'workshop', 'name');
+INSERT INTO prefix_log_display VALUES ('workshop', 'submissions', 'workshop', 'name');
+INSERT INTO prefix_log_display VALUES ('workshop', 'view', 'workshop', 'name');
+INSERT INTO prefix_log_display VALUES ('workshop', 'update', 'workshop', 'name');
 
 COMMIT;