fix for bug 5205

diff --git a/backup/db/mysql.php b/backup/db/mysql.php
index 13864c2b2bfc367c00e1b01c8abce6f994e172f3..b9eda335d4f6342d86ea6075d5a9f6584013895a 100644 (file)
--- a/backup/db/mysql.php
+++ b/backup/db/mysql.php
@@ -135,6 +135,16 @@ function backup_upgrade($oldversion=0) {
         }
     }
 
+
+    // code to drop the prefix in tables
+    if ($oldversion < 2006042100) {
+        $result = execute_sql("ALTER TABLE {$CFG->prefix}backup_files DROP INDEX {$CFG->prefix}backup_files_uk");
+        $result = execute_sql("ALTER TABLE {$CFG->prefix}backup_ids DROP INDEX {$CFG->prefix}backup_ids_uk");
+        $result = execute_sql("ALTER TABLE {$CFG->prefix}backup_files ADD UNIQUE INDEX {$CFG->prefix}backup_files_uk(backup_code,file_type(10),path(255))");
+        $result = execute_sql("ALTER TABLE {$CFG->prefix}backup_ids ADD UNIQUE INDEX {$CFG->prefix}backup_ids_uk(backup_code,table_name(30),old_id)");
+    }
+
+
     //Finally, return result
     return $result;
 

diff --git a/backup/db/mysql.sql b/backup/db/mysql.sql
index d098d9ee5f104d150d5003a1c024bcee9eee1e4f..d0d2bc683359a8b0b0f57425b1b076491f9d0587 100644 (file)
--- a/backup/db/mysql.sql
+++ b/backup/db/mysql.sql
@@ -10,7 +10,7 @@ CREATE TABLE `prefix_backup_files` (
   `old_id` int(10) unsigned default NULL,
   `new_id` int(10) unsigned default NULL,
   PRIMARY KEY  (`id`),
-  UNIQUE KEY `prefix_backup_files_uk` (`backup_code`,`file_type`,`path`)
+  UNIQUE KEY `backup_files_uk` (`backup_code`,`file_type`,`path`)
 ) TYPE=MyISAM COMMENT='To store and recode ids to user and course files.';
 # --------------------------------------------------------
 
@@ -26,7 +26,7 @@ CREATE TABLE `prefix_backup_ids` (
   `new_id` int(10) unsigned default NULL,
   `info` mediumtext,
   PRIMARY KEY  (`id`),
-  UNIQUE KEY `prefix_backup_ids_uk` (`backup_code` ,`table_name`,`old_id`)
+  UNIQUE KEY `backup_ids_uk` (`backup_code` ,`table_name`,`old_id`)
 ) TYPE=MyISAM COMMENT='To store and convert ids in backup/restore';
 # --------------------------------------------------------
 

diff --git a/backup/version.php b/backup/version.php
index 74125a4bdc5cdff6df418b10c57ad033c8293cdd..60a479aecba68c19f5adb7e793c99ee8596e6ff2 100644 (file)
--- a/backup/version.php
+++ b/backup/version.php
@@ -5,6 +5,6 @@
 // database (backup_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)
 
-$backup_version = 2006032900;   // The current version is a date (YYYYMMDDXX)
+$backup_version = 2006042100;   // The current version is a date (YYYYMMDDXX)
 
 $backup_release = "1.6beta1";  // User-friendly version number