From 1ef51a6c423d880bb13299c6e48e8606f5df19ba Mon Sep 17 00:00:00 2001 From: mjollnir_ Date: Thu, 18 Nov 2004 02:40:24 +0000 Subject: [PATCH] Replaced prefix_ with CFG->prefix for DROP of indexes before creation because of being inside execute_sql rather than modify_database - dialogue module --- mod/dialogue/db/mysql.php | 10 +++++----- mod/dialogue/db/postgres7.php | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mod/dialogue/db/mysql.php b/mod/dialogue/db/mysql.php index d33c339cad..6a34befb47 100644 --- a/mod/dialogue/db/mysql.php +++ b/mod/dialogue/db/mysql.php @@ -16,11 +16,11 @@ function dialogue_upgrade($oldversion) { } if ($oldversion < 2004111000) { - execute_sql('ALTER TABLE prefix_dialogue DROP KEY course;',false); - execute_sql('ALTER TABLE prefix_dialogue_conversations DROP KEY recipientid;',false); - execute_sql('ALTER TABLE prefix_dialogue_conversations DROP KEY userid;',false); - execute_sql('ALTER TABLE prefix_dialogue_entries DROP KEY dialogueid;',false); - execute_sql('ALTER TABLE prefix_dialogue_entries DROP KEY userid;',false); + execute_sql("ALTER TABLE {$CFG->prefix}dialogue DROP KEY course;",false); + execute_sql("ALTER TABLE {$CFG->prefix}dialogue_conversations DROP KEY recipientid;",false); + execute_sql("ALTER TABLE {$CFG->prefix}dialogue_conversations DROP KEY userid;",false); + execute_sql("ALTER TABLE {$CFG->prefix}dialogue_entries DROP KEY dialogueid;",false); + execute_sql("ALTER TABLE {$CFG->prefix}dialogue_entries DROP KEY userid;",false); modify_database('','ALTER TABLE prefix_dialogue ADD KEY course (course);'); modify_database('','ALTER TABLE prefix_dialogue_conversations ADD KEY recipientid (recipientid);'); diff --git a/mod/dialogue/db/postgres7.php b/mod/dialogue/db/postgres7.php index b62f02ec1f..7f66c0878f 100644 --- a/mod/dialogue/db/postgres7.php +++ b/mod/dialogue/db/postgres7.php @@ -7,11 +7,11 @@ function dialogue_upgrade($oldversion) { global $CFG; if ($oldversion < 2004111000) { - execute_sql('DROP INDEX prefix_dialogue_course_idx;',false); - execute_sql('DROP INDEX prefix_dialogue_conversations_userid_idx;',false); - execute_sql('DROP INDEX prefix_dialogue_conversations_recipientid_idx;',false); - execute_sql('DROP INDEX prefix_dialogue_entries_dialogueid_idx;',false); - execute_sql('DROP INDEX prefix_dialogue_entries_userid_idx;',false); + execute_sql("DROP INDEX {$CFG->prefix}dialogue_course_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}dialogue_conversations_userid_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}dialogue_conversations_recipientid_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}dialogue_entries_dialogueid_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}dialogue_entries_userid_idx;",false); modify_database('','CREATE INDEX prefix_dialogue_course_idx ON prefix_dialogue (course);'); modify_database('','CREATE INDEX prefix_dialogue_conversations_userid_idx ON prefix_dialogue_conversations (userid);'); -- 2.39.5