From e565767d24a0b8367fd36e3c4a594129cb3f837c Mon Sep 17 00:00:00 2001
From: toyomoyo <toyomoyo>
Date: Thu, 4 May 2006 09:36:32 +0000
Subject: [PATCH] fix for 5426, inconsistent prefixes, and lengthened some
 index to varchar(100) during migration

---
 lib/db/migrate2utf8.xml |  6 +++---
 lib/db/mysql.php        | 22 ++++++++++++++++++++++
 version.php             |  4 ++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/lib/db/migrate2utf8.xml b/lib/db/migrate2utf8.xml
index f72526036de..c802452b4ee 100755
--- a/lib/db/migrate2utf8.xml
+++ b/lib/db/migrate2utf8.xml
@@ -362,7 +362,7 @@
             migrate2utf8_course_fullname(RECORDID)
           </PHP_FUNCTION>
         </FIELD>
-        <FIELD name="shortname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="shortname" addindex="shortname(shortname(15))">
+        <FIELD name="shortname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="shortname" addindex="shortname(shortname(100))">
           <PHP_FUNCTION>
             migrate2utf8_course_shortname(RECORDID)
           </PHP_FUNCTION>
@@ -426,12 +426,12 @@
             migrate2utf8_user_idnumber(RECORDID)
           </PHP_FUNCTION>
         </FIELD>
-        <FIELD name="firstname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_firstname" addindex="user_firstname(firstname(20))">
+        <FIELD name="firstname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_firstname" addindex="user_firstname(firstname(100))">
           <PHP_FUNCTION>
             migrate2utf8_user_firstname(RECORDID)
           </PHP_FUNCTION>
         </FIELD>
-        <FIELD name="lastname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_lastname" addindex="user_lastname(lastname(20))">
+        <FIELD name="lastname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_lastname" addindex="user_lastname(lastname(100))">
           <PHP_FUNCTION>
             migrate2utf8_user_lastname(RECORDID)
           </PHP_FUNCTION>
diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 206ffe88a63..f0447380889 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1921,6 +1921,28 @@ function main_upgrade($oldversion=0) {
         table_column('user','url','url','varchar','255','','','not null');
     }
     
+    
+    if ($oldversion < 2006050400) {
+
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_deleted_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_confirmed_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_firstname_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_lastname_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_city_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_country_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_lastaccess_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_email_idx;",false);
+
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_deleted (deleted)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_confirmed (confirmed)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_firstname (firstname)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_lastname (lastname)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_city (city)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_country (country)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_lastaccess (lastaccess)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_email (email)",false);
+    }
+    
     return $result;
 }
 
diff --git a/version.php b/version.php
index 64eb018df8d..d4faccc87e4 100644
--- a/version.php
+++ b/version.php
@@ -6,9 +6,9 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006050300;  // YYYYMMDD = date
+   $version = 2006050400;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
-   $release = '1.7 dev';    // Human-friendly version name
+   $release = '1.6 Beta 5';    // Human-friendly version name
 
 ?>