Moving from lastIP to lastip everywhere. Bug 5763.

(http://moodle.org/bugs/bug.php?op=show&bugid=5763)

Merged (more or less) from MOODLE_16_STABLE

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 4fe7e51d625a4b0fca4a88861222932d0866d065..2974512cd36d15d13f8013def71eb812c37f0f65 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1983,6 +1983,15 @@ function main_upgrade($oldversion=0) {
             execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('course', 'report stats', 'course', 'fullname')");
         }
     }
+
+    //Renaming lastIP to lastip (all fields lowercase)
+    if ($oldversion < 2006060900) {
+        //Only if it exists
+        $fields = $db->MetaColumnNames($CFG->prefix.'user');
+        if (in_array('lastIP',$fields)) {
+            table_column("user", "lastIP", "lastip", "varchar", "15", "", "", "not null", "currentlogin");
+        }
+    }
     
     return $result;
 }

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 96e1d6c3fb8e3030515c139783caebc4b0f592be..20976e780b4c77d4ff15d5b77738d95e08051a1f 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -609,7 +609,7 @@ CREATE TABLE `prefix_user` (
   `lastaccess` int(10) unsigned NOT NULL default '0',
   `lastlogin` int(10) unsigned NOT NULL default '0',
   `currentlogin` int(10) unsigned NOT NULL default '0',
-  `lastIP` varchar(15) NOT NULL default '',
+  `lastip` varchar(15) NOT NULL default '',
   `secret` varchar(15) NOT NULL default '',
   `picture` tinyint(1) NOT NULL default '0',
   `url` varchar(255) NOT NULL default '',

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 31df850b9b45c26d656f78bd002759103cec4e2a..6d5c8d0c49e5b343fec6a7c29a21750a5a935e02 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1611,6 +1611,16 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    //Renaming lastIP to lastip (all fields lowercase)
+    if ($oldversion < 2006060900) {
+        //Not needed unded PG because it stores fieldnames lowecase by default
+        //Only if it exists (because MOODLE_16_STABLE could have done this work before. Bug 5763)
+        //$fields = $db->MetaColumnNames($CFG->prefix.'user');
+        //if (in_array('lastIP',$fields)) {
+        //    table_column("user", "lastIP", "lastip", "varchar", "15", "", "", "", "currentlogin");
+        //}
+    }
+
     return $result;
 }
 

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 62ec8abc4544c1d278a8671de471ca2da5f94dae..46384c59cd907011f8ebff02e8c1d8a37920e954 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -428,7 +428,7 @@ CREATE TABLE prefix_user (
    lastaccess integer NOT NULL default '0',
    lastlogin integer NOT NULL default '0',
    currentlogin integer NOT NULL default '0',
-   lastIP varchar(15) default NULL,
+   lastip varchar(15) default NULL,
    secret varchar(15) default NULL,
    picture integer default NULL,
    url varchar(255) default NULL,

diff --git a/version.php b/version.php
index 8f3415f81135c4c74102d205aa78501f12f4aa06..c6f7a9a606d5ed1ac653bab5430a619ed709bedf 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 = 2006060400;  // YYYYMMDD = date
+   $version = 2006060900;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.7 dev';    // Human-friendly version name