Bugtracker 5023, fixes 'Database upgrade issue: 'relation "backup_files_u" already...

diff --git a/backup/db/mysql.php b/backup/db/mysql.php
index 8a3ab1ffcb2a42baf127405fc5aee33d2d1d5ec6..13864c2b2bfc367c00e1b01c8abce6f994e172f3 100644 (file)
--- a/backup/db/mysql.php
+++ b/backup/db/mysql.php
@@ -115,7 +115,7 @@ function backup_upgrade($oldversion=0) {
                           `old_id` int(10) unsigned default NULL,
                           `new_id` int(10) unsigned default NULL,
                           PRIMARY KEY  (`id`),
-                          UNIQUE KEY `backup_files_uk` (`backup_code`,`file_type`,`path`)
+                          UNIQUE KEY `{$CFG->prefix}backup_files_uk` (`backup_code`,`file_type`,`path`)
                       ) TYPE=MyISAM COMMENT='To store and recode ids to user and course files.'");
         }
         if ($result) {
@@ -130,7 +130,7 @@ function backup_upgrade($oldversion=0) {
                           `new_id` int(10) unsigned default NULL,
                           `info` mediumtext,
                           PRIMARY KEY  (`id`),
-                          UNIQUE KEY `backup_ids_uk` (`backup_code` ,`table_name`,`old_id`)
+                          UNIQUE KEY `{$CFG->prefix}backup_ids_uk` (`backup_code` ,`table_name`,`old_id`)
                       ) TYPE=MyISAM COMMENT='To store and convert ids in backup/restore'");
         }
     }

diff --git a/backup/db/mysql.sql b/backup/db/mysql.sql
index d0d2bc683359a8b0b0f57425b1b076491f9d0587..d098d9ee5f104d150d5003a1c024bcee9eee1e4f 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 `backup_files_uk` (`backup_code`,`file_type`,`path`)
+  UNIQUE KEY `prefix_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 `backup_ids_uk` (`backup_code` ,`table_name`,`old_id`)
+  UNIQUE KEY `prefix_backup_ids_uk` (`backup_code` ,`table_name`,`old_id`)
 ) TYPE=MyISAM COMMENT='To store and convert ids in backup/restore';
 # --------------------------------------------------------
 

diff --git a/backup/db/postgres7.php b/backup/db/postgres7.php
index 15423128e75e31acb8562d799e676852840e4acb..611bf1e5a838b2d7cef0c69eb73e11a772856d49 100644 (file)
--- a/backup/db/postgres7.php
+++ b/backup/db/postgres7.php
@@ -33,7 +33,7 @@ function backup_upgrade($oldversion=0) {
                           path varchar(255) NOT NULL default '',
                           old_id integer default NULL,
                           new_id integer default NULL,
-                          CONSTRAINT backup_files_uk UNIQUE (backup_code, file_type, path))");
+                          CONSTRAINT {$CFG->prefix}backup_files_uk UNIQUE (backup_code, file_type, path))");
         }
         if ($result) {
             $result = execute_sql("DROP TABLE {$CFG->prefix}backup_ids");
@@ -46,7 +46,7 @@ function backup_upgrade($oldversion=0) {
                           old_id integer NOT NULL default '0',
                           new_id integer default NULL,
                           info text,
-                          CONSTRAINT backup_ids_uk UNIQUE (backup_code, table_name, old_id))");
+                          CONSTRAINT {$CFG->prefix}backup_ids_uk UNIQUE (backup_code, table_name, old_id))");
         }
     }
 

diff --git a/backup/db/postgres7.sql b/backup/db/postgres7.sql
index 88d8413041dcce6a8b6b3f383d9adad914dce561..d39f76402dba0389bc37f41a1a253ea48649eb67 100644 (file)
--- a/backup/db/postgres7.sql
+++ b/backup/db/postgres7.sql
@@ -24,7 +24,7 @@ CREATE TABLE prefix_backup_ids (
   old_id integer NOT NULL default '0',
   new_id integer default NULL,
   info text,
-  CONSTRAINT backup_ids_uk UNIQUE (backup_code, table_name, old_id)
+  CONSTRAINT prefix_backup_ids_uk UNIQUE (backup_code, table_name, old_id)
 );