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

MDL-9907 searching ilike pg compatibility fix

Browse Source
This commit is contained in:
skodak
2008-04-16 18:56:31 +00:00
parent e24aa3d6ba
commit 35ef2c8919
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/view.php
+5 -6
View File
@@ -399,6 +399,8 @@
$groupselect = ' ';
}
$ilike = sql_ilike(); //Be case-insensitive
/// Find the field we are sorting on
if ($sort == DATA_FIRSTNAME or $sort == DATA_LASTNAME or empty($sort)) {
@@ -428,7 +430,7 @@
if (!empty($advanced)) { //If advanced box is checked.
foreach($search_array as $key => $val) { //what does $search_array hold?
if ($key == DATA_FIRSTNAME or $key == DATA_LASTNAME) {
$searchselect .= " AND $val->field LIKE '%{$val->data}%'";
$searchselect .= " AND $val->field $ilike '%{$val->data}%'";
continue;
}
$tables .= ', '.$CFG->prefix.'data_content c'.$key.' ';
@@ -436,7 +438,6 @@
$searchselect .= ' AND ('.$val->sql.') ';
}
} else if ($search) {
$ilike = sql_ilike(); //Be case-insensitive
$searchselect = " AND (cs.content $ilike '%$search%' OR u.firstname $ilike '%$search%' OR u.lastname $ilike '%$search%' ) ";
} else {
$searchselect = ' ';
@@ -466,7 +467,7 @@
if (!empty($advanced)) { //If advanced box is checked.
foreach($search_array as $key => $val) { //what does $search_array hold?
if ($key == DATA_FIRSTNAME or $key == DATA_LASTNAME) {
$searchselect .= " AND $val->field LIKE '%{$val->data}%'";
$searchselect .= " AND $val->field $ilike '%{$val->data}%'";
continue;
}
$tables .= ', '.$CFG->prefix.'data_content c'.$key.' ';
@@ -474,7 +475,6 @@
$searchselect .= ' AND ('.$val->sql.') ';
}
} else if ($search) {
$ilike = sql_ilike(); //Be case-insensitive
$searchselect = " AND (cs.content $ilike '%$search%' OR u.firstname $ilike '%$search%' OR u.lastname $ilike '%$search%' ) ";
} else {
$searchselect = ' ';
@@ -498,7 +498,7 @@
if (!empty($advanced)) { //Advanced search box again.
foreach($search_array as $key => $val) {
if ($key == DATA_FIRSTNAME or $key == DATA_LASTNAME) {
$searchselect .= " AND $val->field LIKE '%{$val->data}%'";
$searchselect .= " AND $val->field $ilike '%{$val->data}%'";
continue;
}
$tables .= ', '.$CFG->prefix.'data_content c'.$key.' ';
@@ -506,7 +506,6 @@
$searchselect .= ' AND ('.$val->sql.') ';
}
} else {
$ilike = sql_ilike(); //Be case-insensitive
$searchselect = " AND (c.content $ilike '%$search%' OR u.firstname $ilike '%$search%' OR u.lastname $ilike '%$search%' ) ";
}