Permalink
Browse files

Adding some outer spaces to returned SQL to avoid wrong

sentences caused by concatenation.

Merged from MOODLE_18_STABLE
  • Loading branch information...
stronk7
stronk7 committed Dec 3, 2007
1 parent 257d668 commit 50371de63b1d3df49b01142cf6bcf39fcffe485b
Showing with 11 additions and 11 deletions.
  1. +11 −11 lib/dmllib.php
View
@@ -1832,7 +1832,7 @@ function sql_concat_join($separator="' '", $elements=array()) {
* ... AND ' . sql_isempty('tablename', 'fieldname', true/false, true/false);
*
* (see parameters description below)
- *
+ *
* @param string $tablename name of the table (without prefix). Not used for now but can be
* necessary in the future if we want to use some introspection using
* meta information against the DB. /// TODO ///
@@ -1845,28 +1845,28 @@ function sql_isempty($tablename, $fieldname, $nullablefield, $textfield) {
global $CFG;
- $sql = $fieldname . " = '' ";
+ $sql = $fieldname . " = ''";
switch ($CFG->dbfamily) {
case 'mssql':
if ($textfield) {
- $sql = sql_compare_text($fieldname) . " = '' ";
+ $sql = sql_compare_text($fieldname) . " = ''";
}
break;
case 'oracle':
if ($nullablefield) {
- $sql = $fieldname . " IS NULL "; /// empties in nullable fields are stored as
- } else { /// NULLs
+ $sql = $fieldname . " IS NULL"; /// empties in nullable fields are stored as
+ } else { /// NULLs
if ($textfield) {
- $sql = sql_compare_text($fieldname) . " = ' ' "; /// oracle_dirty_hack inserts 1-whitespace
- } else { /// in NOT NULL varchar and text columns so
- $sql = $fieldname . " = ' ' "; /// we need to look for that in any situation
+ $sql = sql_compare_text($fieldname) . " = ' '"; /// oracle_dirty_hack inserts 1-whitespace
+ } else { /// in NOT NULL varchar and text columns so
+ $sql = $fieldname . " = ' '"; /// we need to look for that in any situation
}
}
break;
}
- return $sql;
+ return ' ' . $sql . ' '; /// Adding spaces to avoid wrong SQLs due to concatenation
}
/**
@@ -1886,7 +1886,7 @@ function sql_isempty($tablename, $fieldname, $nullablefield, $textfield) {
* ... AND ' . sql_isnotempty('tablename', 'fieldname', true/false, true/false);
*
* (see parameters description below)
- *
+ *
* @param string $tablename name of the table (without prefix). Not used for now but can be
* necessary in the future if we want to use some introspection using
* meta information against the DB. /// TODO ///
@@ -1897,7 +1897,7 @@ function sql_isempty($tablename, $fieldname, $nullablefield, $textfield) {
*/
function sql_isnotempty($tablename, $fieldname, $nullablefield, $textfield) {
- return '( NOT ' . sql_isempty($tablename, $fieldname, $nullablefield, $textfield) . ')';
+ return ' ( NOT ' . sql_isempty($tablename, $fieldname, $nullablefield, $textfield) . ') ';
}
/**

0 comments on commit 50371de

Please sign in to comment.