From 746a04c500bd23ef2eedab5f0de26ca34991f776 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Sun, 17 Sep 2006 06:37:59 +0000
Subject: [PATCH] Adding defaultrole to course table

---
 lib/accesslib.php    | 5 +++++
 lib/db/install.xml   | 5 +++--
 lib/db/mysql.php     | 8 ++++++++
 lib/db/mysql.sql     | 1 +
 lib/db/postgres7.php | 8 ++++++++
 lib/db/postgres7.sql | 3 ++-
 version.php          | 2 +-
 7 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/lib/accesslib.php b/lib/accesslib.php
index e93fde2211..7c5bb6a843 100755
--- 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 6a615652f1..9272e5efea 100644
--- 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 f6aedefb35..e9157c3f14 100644
--- 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 2fe88c2793..57cfd7ba5e 100644
--- 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 1129c3db24..5dde54f3a0 100644
--- 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 e1071f90c9..97fa7686ad 100644
--- 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 d57c095d49..f8299175ff 100644
--- 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
-- 
2.39.5