From: skodak <skodak>
Date: Sun, 13 Sep 2009 20:05:44 +0000 (+0000)
Subject: MDL-20273 updated web services and functions description tables , includes indexes... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5b9a70a15a8fbc1a0ff36accc69ac9d886f8705b;p=moodle.git

MDL-20273 updated web services and functions description tables , includes indexes and foreign keys - oops forgot unique service name index
---

diff --git a/lib/db/install.xml b/lib/db/install.xml
index dda0aaa082..6b33009777 100644
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -2292,6 +2292,9 @@
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
       </KEYS>
+      <INDEXES>
+        <INDEX NAME="name" UNIQUE="true" FIELDS="name"/>
+      </INDEXES>
     </TABLE>
     <TABLE NAME="external_services_functions" COMMENT="lists functions available in each service group" PREVIOUS="external_services" NEXT="external_services_users">
       <FIELDS>
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index b72731a250..77a57aca3f 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2555,19 +2555,19 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         upgrade_main_savepoint($result, 2009090800);
     }
 
-    if ($result && $oldversion < 2009091300) {
+    if ($result && $oldversion < 2009091306) {
         // drop all previous tables defined during the dev phase
-        $dropold = array('external_services_functions', 'external_services', 'external_functions');
+        $dropold = array('external_services_users', 'external_services_functions', 'external_services', 'external_functions');
         foreach ($dropold as $tablename) {
             $table = new xmldb_table($tablename);
             if ($dbman->table_exists($table)) {
                 $dbman->drop_table($table);
             }
         }
-        upgrade_main_savepoint($result, 2009091300);
+        upgrade_main_savepoint($result, 2009091306);
     }
 
-    if ($result && $oldversion < 2009091301) {
+    if ($result && $oldversion < 2009091307) {
     /// Define table external_functions to be created
         $table = new xmldb_table('external_functions');
 
@@ -2589,10 +2589,10 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         $dbman->create_table($table);
 
     /// Main savepoint reached
-        upgrade_main_savepoint($result, 2009091301);
+        upgrade_main_savepoint($result, 2009091307);
     }
 
-    if ($result && $oldversion < 2009091302) {
+    if ($result && $oldversion < 2009091308) {
     /// Define table external_services to be created
         $table = new xmldb_table('external_services');
 
@@ -2607,14 +2607,17 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
     /// Adding keys to table external_services
         $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
 
+    /// Adding indexes to table external_services
+        $table->add_index('name', XMLDB_INDEX_UNIQUE, array('name'));
+
     /// Launch create table for external_services
         $dbman->create_table($table);
 
     /// Main savepoint reached
-        upgrade_main_savepoint($result, 2009091302);
+        upgrade_main_savepoint($result, 2009091308);
     }
 
-    if ($result && $oldversion < 2009091303) {
+    if ($result && $oldversion < 2009091309) {
     /// Define table external_services_functions to be created
         $table = new xmldb_table('external_services_functions');
 
@@ -2631,10 +2634,10 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         $dbman->create_table($table);
 
     /// Main savepoint reached
-        upgrade_main_savepoint($result, 2009091303);
+        upgrade_main_savepoint($result, 2009091309);
     }
 
-    if ($result && $oldversion < 2009091304) {
+    if ($result && $oldversion < 2009091310) {
     /// Define table external_services_users to be created
         $table = new xmldb_table('external_services_users');
 
@@ -2652,7 +2655,7 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         $dbman->create_table($table);
 
     /// Main savepoint reached
-        upgrade_main_savepoint($result, 2009091304);
+        upgrade_main_savepoint($result, 2009091310);
     }
 
     return $result;
diff --git a/version.php b/version.php
index 0688bd00d0..ca5496ce93 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 = 2009091305;  // YYYYMMDD   = date of the last version bump
+    $version = 2009091310;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20090913)';  // Human-friendly version name