From 917fddb5e29af3f9207237e5c67b9f96bbd32e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Tue, 8 Jan 2013 17:12:58 +0100 Subject: [PATCH] MDL-37420 add support for db schemas in enrol test --- enrol/database/tests/sync_test.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/enrol/database/tests/sync_test.php b/enrol/database/tests/sync_test.php index 8009c4651fc..aac8a7630e3 100644 --- a/enrol/database/tests/sync_test.php +++ b/enrol/database/tests/sync_test.php @@ -107,7 +107,11 @@ class enrol_database_testcase extends advanced_testcase { $dbman->drop_table($table); } $dbman->create_table($table); - set_config('remoteenroltable', $CFG->prefix.'enrol_database_test_enrols', 'enrol_database'); + if (!empty($CFG->dboptions['dbschema'])) { + set_config('remoteenroltable', $CFG->dboptions['dbschema'].'.'.$CFG->prefix.'enrol_database_test_enrols', 'enrol_database'); + } else { + set_config('remoteenroltable', $CFG->prefix.'enrol_database_test_enrols', 'enrol_database'); + } set_config('remotecoursefield', 'courseid', 'enrol_database'); set_config('remoteuserfield', 'userid', 'enrol_database'); set_config('remoterolefield', 'roleid', 'enrol_database'); @@ -123,7 +127,11 @@ class enrol_database_testcase extends advanced_testcase { $dbman->drop_table($table); } $dbman->create_table($table); - set_config('newcoursetable', $CFG->prefix.'enrol_database_test_courses', 'enrol_database'); + if (!empty($CFG->dboptions['dbschema'])) { + set_config('newcoursetable', $CFG->dboptions['dbschema'].'.'.$CFG->prefix.'enrol_database_test_courses', 'enrol_database'); + } else { + set_config('newcoursetable', $CFG->prefix.'enrol_database_test_courses', 'enrol_database'); + } set_config('newcoursefullname', 'fullname', 'enrol_database'); set_config('newcourseshortname', 'shortname', 'enrol_database'); set_config('newcourseidnumber', 'idnumber', 'enrol_database');