From 0f6be16364c1e3c93502609ce906d8762f76e57d Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Wed, 13 Aug 2008 13:14:55 +0000
Subject: [PATCH] Merged in from STABLE trunk...

---
 lib/upgrades/UpgradeFunctions.inc.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/upgrades/UpgradeFunctions.inc.php b/lib/upgrades/UpgradeFunctions.inc.php
index 6233e82..cffcaba 100644
--- a/lib/upgrades/UpgradeFunctions.inc.php
+++ b/lib/upgrades/UpgradeFunctions.inc.php
@@ -150,7 +150,6 @@ class UpgradeFunctions {
                 continue;
             }
 
-
             $doneTables[] = $tableName;
 
             if(strpos($tableName, 'zseq_', 0) !== false){
@@ -161,22 +160,27 @@ class UpgradeFunctions {
             $query = "SELECT max(id) FROM {$tableName}";
             $aId = DBUtil::getOneResult($query);
 
-            if(PEAR::isError($aId)){
-                // Means that the table doesn't have an id column
-                continue;
-            }
-
             // If there's no result, then the table may be empty
-            if(!empty($aId)){
+            if(!PEAR::isError($aId)){
                 $id = (int)$aId['max(id)'] + 1;
 
                 $query = "UPDATE {$tableName} SET id = {$id} WHERE id = 0";
                 $res = DBUtil::runQuery($query, $db);
+            }else{
+                $default->log->error('Add auto_increment, fail on get max id: '.$aId->getMessage());
             }
 
             // Update the table, set id to auto_increment
             $query = "ALTER TABLE {$tableName} CHANGE `id` `id` int (11) NOT NULL AUTO_INCREMENT";
             $res = DBUtil::runQuery($query, $db);
+
+            if(PEAR::isError($res)){
+                $default->log->error('Add auto_increment, fail on change id to auto_increment: '.$res->getMessage());
+
+                // try again with mediumint
+                $query = "ALTER TABLE {$tableName} CHANGE `id` `id` mediumint (9) NOT NULL AUTO_INCREMENT";
+                $res = DBUtil::runQuery($query, $db);
+            }
         }
     }
 
--
libgit2 0.21.4