From 5b7984a57ab4e666467dab2dbc0aecaa848fd77d Mon Sep 17 00:00:00 2001
From: Penny Leach <penny@liip.ch>
Date: Fri, 29 Jan 2010 01:38:47 +0000
Subject: [PATCH] mnet MDL-21473   add enabled flag on to remote_rpc mnet table

---
 lib/db/install.xml |  3 ++-
 lib/db/upgrade.php | 21 ++++++++++++++++++---
 version.php        |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/db/install.xml b/lib/db/install.xml
index 1f97815fadd..e0ae098f577 100644
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1347,7 +1347,8 @@
         <FIELD NAME="functionname" TYPE="char" LENGTH="40" NOTNULL="true" SEQUENCE="false" PREVIOUS="id" NEXT="xmlrpcpath"/>
         <FIELD NAME="xmlrpcpath" TYPE="char" LENGTH="80" NOTNULL="true" SEQUENCE="false" PREVIOUS="functionname" NEXT="plugintype"/>
         <FIELD NAME="plugintype" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false" PREVIOUS="xmlrpcpath" NEXT="pluginname"/>
-        <FIELD NAME="pluginname" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false" PREVIOUS="plugintype"/>
+        <FIELD NAME="pluginname" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false" PREVIOUS="plugintype" NEXT="enabled"/>
+        <FIELD NAME="enabled" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="false" SEQUENCE="false" PREVIOUS="pluginname"/>
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index a824bffa010..ff8b4ecb6d6 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2973,9 +2973,6 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
             $dbman->add_field($table, $field);
         }
 
-        /// Main savepoint reached
-        upgrade_main_savepoint($result, 2010012901);
-
     /// Define field pluginname to be added to mnet_remote_rpc
         $field = new xmldb_field('pluginname', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, null, 'plugintype');
 
@@ -2983,6 +2980,24 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         if (!$dbman->field_exists($table, $field)) {
             $dbman->add_field($table, $field);
         }
+
+        /// Main savepoint reached
+        upgrade_main_savepoint($result, 2010012901);
+    }
+
+    if ($result && $oldversion < 2010012902) {
+
+    /// Define field enabled to be added to mnet_remote_rpc
+        $table = new xmldb_table('mnet_remote_rpc');
+        $field = new xmldb_field('enabled', XMLDB_TYPE_INTEGER, '1', null, XMLDB_NOTNULL, null, null, 'pluginname');
+
+    /// Conditionally launch add field enabled
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+        /// Main savepoint reached
+        upgrade_main_savepoint($result, 2010012902);
     }
 
     return $result;
diff --git a/version.php b/version.php
index c6d7942476a..79f5d8f276f 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 = 2010012901;  // YYYYMMDD   = date of the last version bump
+    $version = 2010012902;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20100129)';  // Human-friendly version name