From d836482a34e0dd330fa5ed6bfc841bf89d6d9072 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Fri, 9 Jun 2006 09:47:01 +0000
Subject: [PATCH] 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
---
 lib/db/mysql.php     |  9 +++++++++
 lib/db/mysql.sql     |  2 +-
 lib/db/postgres7.php | 10 ++++++++++
 lib/db/postgres7.sql |  2 +-
 version.php          |  2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 4fe7e51d62..2974512cd3 100644
--- 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 96e1d6c3fb..20976e780b 100644
--- 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 31df850b9b..6d5c8d0c49 100644
--- 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 62ec8abc45..46384c59cd 100644
--- 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 8f3415f811..c6f7a9a606 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 = 2006060400;  // YYYYMMDD = date
+   $version = 2006060900;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.7 dev';    // Human-friendly version name
-- 
2.39.5