L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-42912 glossary: oracle-compatibility of SQL queries

Browse Source
This commit is contained in:
Marina Glancy
2013-11-15 11:53:02 +11:00
parent 89e6c5c0e9
commit 0eb9a0a03d
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/glossary/sql.php
+11 -12
View File
@@ -95,10 +95,8 @@
} else {
$usernamefield = $DB->sql_fullname('u.lastname' , 'u.firstname');
}
$where = "AND " . $DB->sql_substr("upper($usernamefield)", 1, textlib::strlen($hook)) . " = :hookup";
if ( $hook == 'ALL' ) {
$where = '';
if ($hook != 'ALL' && ($hookstrlen = textlib::strlen($hook))) {
$where = "AND " . $DB->sql_substr("upper($usernamefield)", 1, $hookstrlen) . " = :hookup";
}
$sqlselect = "SELECT ge.*, $usernamefield AS glossarypivot, 1 AS userispivot ";
@@ -116,8 +114,8 @@
$where = '';
$params['hookup'] = textlib::strtoupper($hook);
if ($hook != 'ALL' and $hook != 'SPECIAL') {
$where = "AND " . $DB->sql_substr("upper(concept)", 1, textlib::strlen($hook)) . " = :hookup";
if ($hook != 'ALL' and $hook != 'SPECIAL' && ($hookstrlen = itextlib::strlen($hook))) {
$where = "AND " . $DB->sql_substr("upper(concept)", 1, $hookstrlen) . " = :hookup";
}
$sqlselect = "SELECT ge.*, ge.concept AS glossarypivot";
@@ -156,11 +154,12 @@
if (empty($fullsearch)) {
// With fullsearch disabled, look only within concepts and aliases.
$concat = $DB->sql_concat('ge.concept', "' '", "COALESCE(al.alias, '')");
$concat = $DB->sql_concat('ge.concept', "' '", "COALESCE(al.alias, :emptychar)");
} else {
// With fullsearch enabled, look also within definitions.
$concat = $DB->sql_concat('ge.concept', "' '", 'ge.definition', "' '", "COALESCE(al.alias, '')");
$concat = $DB->sql_concat('ge.concept', "' '", 'ge.definition', "' '", "COALESCE(al.alias, :emptychar)");
}
$params['emptychar'] = '';
$searchterms = explode(" ",$hook);
@@ -239,9 +238,9 @@
break;
case 'letter':
if ($hook != 'ALL' and $hook != 'SPECIAL') {
$params['hookup'] = textlib::strtoupper($hook);
$where = "AND " . $DB->sql_substr("upper(concept)", 1, textlib::strlen($hook)) . " = :hookup";
if ($hook != 'ALL' and $hook != 'SPECIAL' and ($hookstrlen = textlib::strlen($hook))) {
$params['hookup'] = core_text::strtoupper($hook);
$where = "AND " . $DB->sql_substr("upper(concept)", 1, $hookstrlen) . " = :hookup";
}
if ($hook == 'SPECIAL') {
//Create appropiate IN contents
@@ -278,4 +277,4 @@
}
$query = "$sqlwrapheader $sqlselect $sqlfrom $sqlwhere $sqlwrapfooter $sqlorderby";
$allentries = $DB->get_records_sql($query, $params, $limitfrom, $limitnum);
$allentries = $DB->get_records_sql($query, $params, $limitfrom, $limitnum);