Fixes for new postgres database creation

diff --git a/mod/quiz/db/postgres7.sql b/mod/quiz/db/postgres7.sql
index 6949b8f9638ee64a66b5ad8a0ffbeaf1a3b0f4b7..d19dae6e379dea659787d2909161ae730359652f 100644 (file)
--- 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 47b0a9931f6181c9be76c43bfae072084e376502..4f66660cdae7f716aed5c53eb3066b996311097d 100644 (file)
--- 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 9095a0a8025340fee3cbc5e46a91497f9f73f8d8..32ca994d632f76e130c304f78202f231b01a0ed1 100644 (file)
--- 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;