bumping up version, chaing user->firstname, user->lastname, course->shortname to...

diff --git a/lib/db/migrate2utf8.xml b/lib/db/migrate2utf8.xml
index 5ab4164775b24747e692627e1466e51c623831ae..7e4733f05ac9b8614a6eddef57b16ff17d4a9fe2 100755 (executable)
--- 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="15" dropindex="shortname" addindex="shortname(shortname(15))">
+        <FIELD name="shortname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="shortname" addindex="shortname(shortname(15))">
           <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="20" 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(20))">
           <PHP_FUNCTION>
             migrate2utf8_user_firstname(RECORDID)
           </PHP_FUNCTION>
         </FIELD>
-        <FIELD name="lastname" method="PHP_FUNCTION" type="varchar" length="20" 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(20))">
           <PHP_FUNCTION>
             migrate2utf8_user_lastname(RECORDID)
           </PHP_FUNCTION>

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 799db2b5ba679e9f9f49eab994be353e92379c29..847ae403c8393177eb342bf0d6a8249e4a52d5c0 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1786,6 +1786,14 @@ function main_upgrade($oldversion=0) {
         modify_database('',"ALTER TABLE prefix_blog_tag_instance CHANGE id id INT UNSIGNED NOT NULL AUTO_INCREMENT");
     }
     
+    // changed user->firstname, user->lastname, course->shortname to varchar(100)
+    
+    if ($oldversion < 2006041900) {
+        table_column('course','shortname','shortname','varchar','100','','','not null');
+        table_column('user','firstname','firstname','varchar','100','','','not null');
+        table_column('user','lastname','lastname','varchar','100','','','not null');
+    }
+    
     return $result;
 }
 

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index fe04ed9828c7076d2be516c1a71150543a852a63..92cb9a9d0eb2a3ea29878754ebf88845d96af77d 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -48,7 +48,7 @@ CREATE TABLE `prefix_course` (
   `sortorder` int(10) unsigned NOT NULL default '0',
   `password` varchar(50) NOT NULL default '',
   `fullname` varchar(254) NOT NULL default '',
-  `shortname` varchar(15) NOT NULL default '',
+  `shortname` varchar(100) NOT NULL default '',
   `idnumber` varchar(100) NOT NULL default '',
   `summary` text NOT NULL default '',
   `format` varchar(10) NOT NULL default 'topics',
@@ -583,8 +583,8 @@ CREATE TABLE `prefix_user` (
   `username` varchar(100) NOT NULL default '',
   `password` varchar(32) NOT NULL default '',
   `idnumber` varchar(64) default NULL,
-  `firstname` varchar(20) NOT NULL default '',
-  `lastname` varchar(20) NOT NULL default '',
+  `firstname` varchar(100) NOT NULL default '',
+  `lastname` varchar(100) NOT NULL default '',
   `email` varchar(100) NOT NULL default '',
   `emailstop` tinyint(1) unsigned NOT NULL default '0',
   `icq` varchar(15) default NULL,

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 9b7a86d418cdabfd34bce3a4b912d4efedb13381..73d9c9a806446ff5097c77fb693bc502f8c00637 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2480,8 +2480,8 @@ function truncate_userinfo($info) {
     $limit = array(
                     'username'    => 100,
                     'idnumber'    =>  64,
-                    'firstname'   =>  20,
-                    'lastname'    =>  20,
+                    'firstname'   => 100,
+                    'lastname'    => 100,
                     'email'       => 100,
                     'icq'         =>  15,
                     'phone1'      =>  20,

diff --git a/version.php b/version.php
index ef5e6859a078c787d6ed289c03b7b7fe1bb934c4..b0bbe665c4214d7f32a3041556f5abfa00731dc0 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 = 2006041801;  // YYYYMMDD = date
+   $version = 2006041900;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.6 Beta 3';    // Human-friendly version name