From e9d5166a3e570acb996ed32f376191c84ca12337 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Wed, 30 Aug 2006 16:37:52 +0000
Subject: [PATCH] fixed wrong type for session data field in mysql, enabled
 feedback when dropping old session table during upgrade

---
 lib/db/mysql.php     | 6 +++++-
 lib/db/mysql.sql     | 2 +-
 lib/db/postgres7.php | 2 +-
 version.php          | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 3e5d0d95d58..dd47603e107 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2143,7 +2143,7 @@ function main_upgrade($oldversion=0) {
     }
 
     if ($oldversion < 2006082900) {
-        execute_sql("DROP TABLE {$CFG->prefix}sessions", false);
+        execute_sql("DROP TABLE {$CFG->prefix}sessions", true);
         execute_sql("
             CREATE TABLE {$CFG->prefix}sessions2 (
                 sesskey VARCHAR(64) NOT NULL default '',
@@ -2160,6 +2160,10 @@ function main_upgrade($oldversion=0) {
         execute_sql("
             CREATE INDEX {$CFG->prefix}sess_exp2_ix ON {$CFG->prefix}sessions2 (expireref);", true);
     }
+
+    if ($oldversion < 2006083001) {
+        table_column('sessions2', 'sessdata', 'sessdata', 'LONGTEXT', '', '', '', '', '');
+    }
     
     return $result;
 }
diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 765d1a55b4b..2c584f1f56e 100644
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -540,7 +540,7 @@ CREATE TABLE prefix_sessions2 (
     expireref VARCHAR(250),
     created DATETIME NOT NULL,
     modified DATETIME NOT NULL,
-    sessdata TEXT,
+    sessdata LONGTEXT,
 CONSTRAINT  PRIMARY KEY (sesskey)
 ) COMMENT='Optional database session storage in new format, not used by default';
 
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index f3e19bc35d2..9df86a3c6af 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1742,7 +1742,7 @@ function main_upgrade($oldversion=0) {
     }
 
     if ($oldversion < 2006082900) {
-        execute_sql("DROP TABLE {$CFG->prefix}sessions", false);
+        execute_sql("DROP TABLE {$CFG->prefix}sessions", true);
         execute_sql("
             CREATE TABLE {$CFG->prefix}sessions2 (
                 sesskey VARCHAR(255) NOT NULL default '',
diff --git a/version.php b/version.php
index ae85a13c9ba..b914e154893 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 = 2006082900;  // YYYYMMDD = date
+   $version = 2006083001;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.7 dev';    // Human-friendly version name