From: stronk7 Date: Thu, 8 Jan 2009 18:43:08 +0000 (+0000) Subject: MDL-17826 restore - proper TEXT comparison. Was breaking MSSQL and Oracle. Merged... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6a4b1e3d0e0e4608a237fc107e1f960f83f5578f;p=moodle.git MDL-17826 restore - proper TEXT comparison. Was breaking MSSQL and Oracle. Merged from 19_STABLE --- diff --git a/backup/restorelib.php b/backup/restorelib.php index 219af471e2..9d008f8056 100644 --- a/backup/restorelib.php +++ b/backup/restorelib.php @@ -3280,8 +3280,13 @@ define('RESTORE_GROUPS_GROUPINGS', 3); } // scale is not course unique - - $sca_db = $DB->get_records('scale', array('scale'=>$sca->scale, 'courseid'=>$course_to_search), true); + //Going to compare LOB columns so, use the cross-db sql_compare_text() in both sides. + $compare_scale_clause = $DB->sql_compare_text('scale') . ' = ' . $DB->sql_compare_text(':scaledesc'); + $params = array('courseid'=>$course_to_search, 'scaledesc'=>$sca->scale); + $sca_db = $DB->get_record_sql("SELECT * + FROM {scale} + WHERE courseid = :courseid + AND $compare_scale_clause", $params, true); //If it doesn't exist, create if (!$sca_db) {