Replaced prefix_ with CFG->prefix for DROP of indexes before creation because of...

diff --git a/mod/exercise/db/mysql.php b/mod/exercise/db/mysql.php
index fccbabc302452c1da5378e78f2c1fbb1820b0bb0..45c82108d8b1b0b5855d227a579670f973c45f48 100644 (file)
--- a/mod/exercise/db/mysql.php
+++ b/mod/exercise/db/mysql.php
@@ -41,12 +41,12 @@ function exercise_upgrade($oldversion) {
     }
 
     if ($oldversion < 2004111200) {
-        execute_sql('ALTER TABLE prefix_exercise DROP INDEX course;',false);
-        execute_sql('ALTER TABLE prefix_exercise_submissions DROP INDEX exerciseid;',false); 
-        execute_sql('ALTER TABLE prefix_exercise_assessments DROP INDEX exerciseid;',false); 
-        execute_sql('ALTER TABLE prefix_exercise_elements DROP INDEX exerciseid;',false);
-        execute_sql('ALTER TABLE prefix_exercise_rubrics DROP INDEX exerciseid;',false);
-        execute_sql('ALTER TABLE prefix_exercise_grades DROP INDEX exerciseid;',false);
+        execute_sql("ALTER TABLE {$CFG->prefix}exercise DROP INDEX course;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}exercise_submissions DROP INDEX exerciseid;",false); 
+        execute_sql("ALTER TABLE {$CFG->prefix}exercise_assessments DROP INDEX exerciseid;",false); 
+        execute_sql("ALTER TABLE {$CFG->prefix}exercise_elements DROP INDEX exerciseid;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}exercise_rubrics DROP INDEX exerciseid;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}exercise_grades DROP INDEX exerciseid;",false);
 
         modify_database('','ALTER TABLE prefix_exercise ADD INDEX course (course);');
         modify_database('','ALTER TABLE prefix_exercise_submissions ADD INDEX exerciseid (exerciseid);');

diff --git a/mod/exercise/db/postgres7.php b/mod/exercise/db/postgres7.php
index a12881fc33e7a97f5f4a685161b81b0f7071b160..b5ab4a7530931dd63da40277e03902a881c5351d 100644 (file)
--- a/mod/exercise/db/postgres7.php
+++ b/mod/exercise/db/postgres7.php
@@ -31,11 +31,11 @@ function exercise_upgrade($oldversion) {
     }
 
     if ($oldversion < 2004111200) {
-        execute_sql('DROP INDEX prefix_exercise_course_idx;',false);
-        execute_sql('DROP INDEX prefix_exercise_submissions_exerciseid_idx;',false);
-        execute_sql('DROP INDEX prefix_exercise_assessments_exerciseid_idx;',false);
-        execute_sql('DROP INDEX prefix_exercise_rubrics_exerciseid_idx;',false);
-        execute_sql('DROP INDEX prefix_exercise_grades_exerciseid_idx;',false);
+        execute_sql("DROP INDEX {$CFG->prefix}exercise_course_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}exercise_submissions_exerciseid_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}exercise_assessments_exerciseid_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}exercise_rubrics_exerciseid_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}exercise_grades_exerciseid_idx;",false);
 
         modify_database('','CREATE INDEX prefix_exercise_course_idx ON prefix_exercise (course);');
         modify_database('','CREATE INDEX prefix_exercise_submissions_exerciseid_idx ON prefix_exercise_submissions (exerciseid);');