mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-13 09:34:30 +02:00
Code Issues Releases Wiki Activity

- DibiDataSource: fixed empty ORDER BY

Browse Source 
- DibiTranslator: removed empty %by handling 
- DibiTranslator: better NULL values handling
This commit is contained in:
David Grudl
2009-03-08 17:36:11 +00:00
parent 5c2245a9d7
commit 7969289aaa
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dibi/libs/DibiDataSource.php
View File

@@ -294,7 +294,7 @@ class DibiDataSource extends DibiObject implements IDataSource
SELECT %n', (empty($this->cols) ? '*' : $this->cols), ' SELECT %n', (empty($this->cols) ? '*' : $this->cols), '
FROM %SQL', $this->sql, ' FROM %SQL', $this->sql, '
WHERE %and', $this->conds, ' WHERE %and', $this->conds, '
ORDER BY %by', $this->sorting, ' %ex', $this->sorting ? array('ORDER BY %by', $this->sorting) : NULL, '
%ofs %lmt', $this->offset, $this->limit %ofs %lmt', $this->offset, $this->limit
); );
} }

25
dibi/libs/DibiTranslator.php
View File

@@ -272,10 +272,6 @@ final class DibiTranslator extends DibiObject
return '(' . implode(', ', $kx) . ') VALUES (' . implode(', ', $vx) . ')'; return '(' . implode(', ', $kx) . ') VALUES (' . implode(', ', $vx) . ')';
case 'by': // key ASC, key DESC case 'by': // key ASC, key DESC
if (empty($value)) {
return $this->driver->escape(TRUE, 'b');
}
foreach ($value as $k => $v) { foreach ($value as $k => $v) {
if (is_string($k)) { if (is_string($k)) {
$v = (is_string($v) && strncasecmp($v, 'd', 1)) || $v > 0 ? 'ASC' : 'DESC'; $v = (is_string($v) && strncasecmp($v, 'd', 1)) || $v > 0 ? 'ASC' : 'DESC';
@@ -302,17 +298,13 @@ final class DibiTranslator extends DibiObject
// with modifier procession // with modifier procession
if ($modifier) { if ($modifier) {
if ($value === NULL) {
return 'NULL';
}
if ($value instanceof IDibiVariable) { if ($value instanceof IDibiVariable) {
return $value->toSql($this, $modifier); return $value->toSql($this, $modifier);
} elseif ($value instanceof DateTime) { } elseif ($value instanceof DateTime) {
$value = $value->format('U'); $value = $value->format('U');
} elseif (!is_scalar($value)) { // array is already processed } elseif ($value !== NULL && !is_scalar($value)) { // array is already processed
$this->hasError = TRUE; $this->hasError = TRUE;
return '**Unexpected type ' . gettype($value) . '**'; return '**Unexpected type ' . gettype($value) . '**';
} }
@@ -321,7 +313,7 @@ final class DibiTranslator extends DibiObject
case 's': // string case 's': // string
case 'bin':// binary case 'bin':// binary
case 'b': // boolean case 'b': // boolean
return $this->driver->escape($value, $modifier); return $value === NULL ? 'NULL' : $this->driver->escape($value, $modifier);
case 'sn': // string or NULL case 'sn': // string or NULL
return $value == '' ? 'NULL' : $this->driver->escape($value, dibi::FIELD_TEXT); // notice two equal signs return $value == '' ? 'NULL' : $this->driver->escape($value, dibi::FIELD_TEXT); // notice two equal signs
@@ -331,20 +323,25 @@ final class DibiTranslator extends DibiObject
// support for long numbers - keep them unchanged // support for long numbers - keep them unchanged
if (is_string($value) && preg_match('#[+-]?\d+(e\d+)?$#A', $value)) { if (is_string($value) && preg_match('#[+-]?\d+(e\d+)?$#A', $value)) {
return $value; return $value;
} else {
return $value === NULL ? 'NULL' : (string) (int) ($value + 0);
} }
return (string) (int) ($value + 0);
case 'f': // float case 'f': // float
// support for extreme numbers - keep them unchanged // support for extreme numbers - keep them unchanged
if (is_string($value) && is_numeric($value) && strpos($value, 'x') === FALSE) { if (is_string($value) && is_numeric($value) && strpos($value, 'x') === FALSE) {
return $value; // something like -9E-005 is accepted by SQL, HEX values are not return $value; // something like -9E-005 is accepted by SQL, HEX values are not
} else {
return $value === NULL ? 'NULL' : rtrim(rtrim(number_format($value, 5, '.', ''), '0'), '.');
} }
return rtrim(rtrim(number_format($value, 5, '.', ''), '0'), '.');
case 'd': // date case 'd': // date
case 't': // datetime case 't': // datetime
$value = is_numeric($value) ? (int) $value : strtotime($value); if ($value === NULL) {
return $this->driver->escape($value, $modifier); return 'NULL';
} else {
return $this->driver->escape(is_numeric($value) ? (int) $value : strtotime($value), $modifier);
}
case 'by': case 'by':
case 'n': // identifier name case 'n': // identifier name