Some additions for postgresql

diff --git a/mod/workshop/db/postgres7.php b/mod/workshop/db/postgres7.php
index 919c7d9281469a7dacda7acba065fbc856fc195f..1a7de6c578cc9b092a009b55e913ed90b50c2c32 100644 (file)
--- a/mod/workshop/db/postgres7.php
+++ b/mod/workshop/db/postgres7.php
@@ -1,14 +1,28 @@
 <?PHP // $Id$
 
-function gallery_upgrade($oldversion) {
+function workshop_upgrade($oldversion) {
 // This function does anything necessary to upgrade
 // older versions to match current functionality
 
     global $CFG;
 
-    if ($oldversion < 2003043000) {
+    if ($oldversion < 2003050400) {
+       table_column("workshop","graded", "agreeassessments", "INT","2", "", "0" ,"NOT NULL");
+       table_column("workshop", "showgrades","hidegrades", "INT","2", "","0", "NOT NULL");
+       table_column("workshop_assessments","","timeagreed", "INT","8", "UNSIGNED", "0", "NOT NULL" );
        
-       }
+       execute_sql("
+            CREATE TABLE {$CFG->prefix}workshop_comments (
+            id SERIAL8 PRIMARY KEY  ,
+            workshopid int8 NOT NULL default '0', 
+            assessmentid int8  NOT NULL default '0',
+            userid int8 NOT NULL default '0',
+            timecreated int8  NOT NULL default '0',
+           mailed int2  NOT NULL default '0',
+            comments text NOT NULL
+        )
+        ");
+    }
     return true;
 }
 

diff --git a/mod/workshop/db/postgres7.sql b/mod/workshop/db/postgres7.sql
index 8f6547eb9c7cf2d527136cae7e08bf714d285f1d..0448a62a30e156c0e8a19ddcb3fff04f6cf9f0ae 100644 (file)
--- a/mod/workshop/db/postgres7.sql
+++ b/mod/workshop/db/postgres7.sql
@@ -12,8 +12,8 @@ CREATE TABLE prefix_workshop (
   format INT2  NOT NULL default '0',
   gradingstrategy INT2  NOT NULL default '1',
   resubmit INT2  NOT NULL default '0',
-  graded INT2  NOT NULL default '1',
-  showgrades INT2  NOT NULL default '0',
+  agreeassessments INT2  NOT NULL default '0',
+  hidegrades INT2  NOT NULL default '0',
   anonymous INT2  NOT NULL default '0',
   includeself INT2  NOT NULL default '0',
   maxbytes INT8  NOT NULL default '100000',
@@ -28,7 +28,8 @@ CREATE TABLE prefix_workshop (
   includeteachersgrade INT  NOT NULL default '0',
   biasweight INT  NOT NULL default '5',
   reliabilityweight INT  NOT NULL default '5',
-  gradingweight INT  NOT NULL default '5'
+  gradingweight INT  NOT NULL default '5',
+  timeagreed INT8 NOT NULL default '0'
 );
 # --------------------------------------------------------
 
@@ -100,6 +101,16 @@ CREATE TABLE prefix_workshop_grades (
   grade INT NOT NULL default '0'
 );
 # --------------------------------------------------------
+CREATE TABLE prefix_workshop_comments (
+  id SERIAL8 PRIMARY KEY,
+  workshopid int8 NOT NULL default '0',
+  assessmentid int8  NOT NULL default '0',
+  userid int8 NOT NULL default '0',
+  timecreated int8  NOT NULL default '0',
+  mailed int2  NOT NULL default '0',
+  comments text NOT NULL
+);
+
 
 INSERT INTO prefix_log_display VALUES ('workshop', 'assess', 'workshop', 'name');
 INSERT INTO prefix_log_display VALUES ('workshop', 'close', 'workshop', 'name');