KTS-3592

"Upgrade failed from 346 to 353." Fixed. A function now runs before the upgrades to add auto_increment to the existing tables. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9083 c91229c3-7414-0410-bfa2-8a42b809f60b

KTS-3592
"Upgrade failed from 346 to 353." Fixed. A function now runs before the upgrades to add auto_increment to the existing tables. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9083 c91229c3-7414-0410-bfa2-8a42b809f60b
Megan Watson
1 parent 769762b2
Showing 3 changed files with 54 additions and 10 deletions
lib/upgrades/UpgradeFunctions.inc.php
lib/upgrades/UpgradeItems.inc.php
sql/mysql/upgrade/3.5.3/add_autoinc-5.sql → sql/mysql/upgrade/3.5.3/add_autoinc.sql
@@ -61,7 +61,7 @@ class UpgradeFunctions {
             '3.1.6.3' => array('cleanupGroupMembership'),
             '3.5.0' => array('cleanupOldKTAdminVersionNotifier', 'updateConfigFile35', 'registerIndexingTasks'),
             '3.5.2' => array('setStorageEngine','dropForeignKeys','dropPrimaryKeys','dropIndexes','createPrimaryKeys','createForeignKeys','createIndexes', 'removeSlashesFromObjects'),
-            '3.5.3' => array('moveConfigSettingsToDB','removeAdminVersionNotifier')
+            '3.5.3' => array('moveConfigSettingsToDB','removeAdminVersionNotifier','addAutoIncrementToTables')
             );
  
     var $descriptions = array(
@@ -93,7 +93,8 @@ class UpgradeFunctions {
             'createIndexes'=>'Recreate db integrity:Create indexes on the database',
             'removeSlashesFromObjects'=>'Remove slashes from documents and folders',
             'moveConfigSettingsToDB' => 'Move the configuration settings from the config.ini file into the new database table.',
-            'removeAdminVersionNotifier' => 'Remove the old Admin Version Notifier Plugin.'
+            'removeAdminVersionNotifier' => 'Remove the old Admin Version Notifier Plugin.',
+            'addAutoIncrementToTables' => 'Update all db tables to use auto_increment.'
             );
     var $phases = array(
             "setPermissionFolder" => 1,
@@ -109,9 +110,47 @@ class UpgradeFunctions {
             'dropIndexes'=>4,
             'createPrimaryKeys'=>5,
             'createForeignKeys'=>6,
-            'createIndexes'=>7,
+            'createIndexes'=>7
             );
  
+    var $priority = array(
+            'addAutoIncrementToTables'=>1
+            );
+
+    /**
+     * Set all tables in the DB to auto increment, thereby removing the use of the zseq tables
+     */
+    function addAutoIncrementToTables()
+    {
+        global $default;
+		DBUtil::setupAdminDatabase();
+		$db = $default->_admindb;
+
+        // Get all tables in the database
+        $query = 'SHOW TABLES';
+        $tableList = DBUtil::getResultArray($query, $db);
+
+        // Ensure that if there is a zero id on plugins and upgrades it is updated
+        $query = "UPDATE plugins SET id = (SELECT max(id)+1 FROM plugins) WHERE id = 0";
+        DBUtil::runQuery($query, $db);
+
+        $query = "UPDATE upgrades SET id = (SELECT max(id)+1 FROM plugins) WHERE id = 0";
+        DBUtil::runQuery($query, $db);
+
+        // Loop through tables and add auto increment
+        foreach ($tableList as $tableArr){
+            $key = key($tableArr);
+            $tableName = $tableArr[$key];
+
+            // Some tables don't have an id column, we ignore those errors and continue
+            $query = "ALTER TABLE {$tableName} CHANGE `id` `id` int (11) NOT NULL AUTO_INCREMENT";
+            DBUtil::runQuery($query, $db);
+        }
+    }
+
+    /**
+     * Copy the modified config values from the config.ini to the appropriate setting in the database
+     */
     function moveConfigSettingsToDB()
     {
         require_once('Config.php');
@@ -1259,7 +1298,7 @@ class UpgradeFunctions {
 		$oScheduler->registerTask();
     }
      // }}}
-    
+
     // {{{  removeAdminVersionNotifier
     function removeAdminVersionNotifier() {
         global $default;
@@ -72,7 +72,7 @@ class UpgradeItem {
     var $date;
     var $result;
  
-    function UpgradeItem($name, $version, $description = null, $phase = 0) {
+    function UpgradeItem($name, $version, $description = null, $phase = 0, $priority = 0) {
         $this->name = $name;
         $this->version = $version;
         if (is_null($description)) {
@@ -80,6 +80,7 @@ class UpgradeItem {
         }
         $this->description = $description;
         $this->phase = $phase;
+        $this->priority = $priority;
     }
  
     function setParent($parent) {
@@ -208,9 +209,9 @@ class SQLUpgradeItem extends UpgradeItem {
             $phase = $details[3];
         }
         if (is_null($priority)) {
-            $this->priority = isset($details[4]) ? $details[4] : 0;
+            $priority = isset($details[4]) ? $details[4] : 0;
         }
-        $this->UpgradeItem($path, $version, $description, $phase);
+        $this->UpgradeItem($path, $version, $description, $phase, $priority);
     }
  
     /**
@@ -338,7 +339,7 @@ class SQLUpgradeItem extends UpgradeItem {
 }
  
 class FunctionUpgradeItem extends UpgradeItem {
-    function FunctionUpgradeItem ($func, $version, $description = null, $phase = null) {
+    function FunctionUpgradeItem ($func, $version, $description = null, $phase = null, $priority = null) {
         $this->type = "func";
         if (is_null($description)) {
             $aUpgradeFunctions = new UpgradeFunctions;
@@ -347,7 +348,10 @@ class FunctionUpgradeItem extends UpgradeItem {
         if (is_null($phase)) {
             $phase = 0;
         }
-        $this->UpgradeItem($func, $version, $description, $phase);
+        if(is_null($priority)){
+            $priority = 0;
+        }
+        $this->UpgradeItem($func, $version, $description, $phase, $priority);
     }
  
     function getUpgrades($origVersion, $currVersion) {
@@ -364,7 +368,8 @@ class FunctionUpgradeItem extends UpgradeItem {
             }
             foreach ($funcs as $func) {
                 $iPhase = KTUtil::arrayGet($aUpgradeFunctions->phases, $func, 0);
-                $ret[] = new FunctionUpgradeItem($func, $version, $aUpgradeFunctions->descriptions[$func], $iPhase);
+                $iPriority = KTUtil::arrayGet($aUpgradeFunctions->priority, $func, 0);
+                $ret[] = new FunctionUpgradeItem($func, $version, $aUpgradeFunctions->descriptions[$func], $iPhase, $iPriority);
             }
         }
         return $ret;