Adding defaultrole to course table

diff --git a/lib/accesslib.php b/lib/accesslib.php
index e93fde2211adfff5f126e4533ba0150b0bcb1f3a..7c5bb6a8434a25ac6919b8dd01295fc617a79052 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -1009,6 +1009,11 @@ function moodle_install_roles() {
     allow_override($adminrole, $studentrole);
     allow_override($adminrole, $guestrole);    
 
+
+    /// Upgrade course table with defaultrole values
+    execute_sql('UPDATE '.$CFG->prefix.'course SET defaultrole = '.$studentrole);
+
+
     // Should we delete the tables after we are done? Not yet.
 }
 

diff --git a/lib/db/install.xml b/lib/db/install.xml
index 6a615652f19c633b6886f6ab9a7aeea22c4a36c1..9272e5efea31df576ae20b24fe87514994023a37 100644 (file)
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="lib/db" VERSION="20060912" COMMENT="XMLDB file for core Moodle tables"
+<XMLDB PATH="lib/db" VERSION="20060917" COMMENT="XMLDB file for core Moodle tables"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
 >
@@ -71,7 +71,8 @@
         <FIELD NAME="enrollable" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="notifystudents" NEXT="enrolstartdate"/>
         <FIELD NAME="enrolstartdate" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="enrollable" NEXT="enrolenddate"/>
         <FIELD NAME="enrolenddate" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="enrolstartdate" NEXT="enrol"/>
-        <FIELD NAME="enrol" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="enrolenddate"/>
+        <FIELD NAME="enrol" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="enrolenddate" NEXT="defaultrole"/>
+        <FIELD NAME="defaultrole" TYPE="int" LENGTH="10" NOTNULL="false" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" COMMENT="The default role given to participants who self-enrol" PREVIOUS="enrol"/>
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for course"/>

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index f6aedefb35abaa1d4776ad6c14430d03ada41939..e9157c3f145e88ec281914790911aec24f9f98a9 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2212,6 +2212,14 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2006091700) {
+        table_column('course','','defaultrole','int','10');
+        if ($studentroles = get_roles_with_capability('moodle/legacy:student', CAP_ALLOW)) {
+            $studentrole = array_shift($studentroles);   /// Take the first one
+            execute_sql('UPDATE '.$CFG->prefix.'course SET defaultrole = '.$studentrole->id);
+        }
+    }
+
     return $result;
 }
 

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 2fe88c27935f649c617ae94d6c9b33f415b174c8..57cfd7ba5ef9ef4207f929da07b01771d06a5e2a 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -86,6 +86,7 @@ CREATE TABLE `prefix_course` (
   `enrolstartdate` int(10) unsigned NOT NULL default '0',
   `enrolenddate` int(10) unsigned NOT NULL default '0',
   `enrol` varchar(20) NOT NULL default '',
+  `defaultrole` int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `category` (`category`),
   KEY `idnumber` (`idnumber`),

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 1129c3db246bbea6f6b68eabca12952107364996..5dde54f3a0e27870cd0193d2e5985a340aa4cc7b 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1812,6 +1812,14 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2006091700) {
+        table_column('course','','defaultrole','int','10');
+        if ($studentroles = get_roles_with_capability('moodle/legacy:student', CAP_ALLOW)) {
+            $studentrole = array_shift($studentroles);   /// Take the first one
+            execute_sql('UPDATE '.$CFG->prefix.'course SET defaultrole = '.$studentrole->id);
+        }
+    }
+
     return $result;
 }
 

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index e1071f90c9a6a38d6f9e199b0bd736f00bc2a25b..97fa7686ad28a8d9e27529475d3db154405a4f4b 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -56,7 +56,8 @@ CREATE TABLE prefix_course (
    enrollable integer NOT NULL default '1',
    enrolstartdate integer NOT NULL default '0',
    enrolenddate integer NOT NULL default '0',
-   enrol varchar(20) NOT NULL default ''
+   enrol varchar(20) NOT NULL default '',
+   defaultrole integer NOT NULL default '0'
 );
 
 CREATE UNIQUE INDEX prefix_course_category_sortorder_uk ON prefix_course (category,sortorder);

diff --git a/version.php b/version.php
index d57c095d494a01c27c936c61a2a63908bf04de4b..f8299175ff8eb5c6f05fd913b5053bc814ac6973 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006091600;  // YYYYMMDD = date
+   $version = 2006091700;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.7 dev';    // Human-friendly version name