mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-25 15:01:29 +02:00
Code Issues Releases Wiki Activity

- DibiTranslator: modifiers %ex, %by, %n improved, %SQL added

Browse Source 
- DibiDataSource: allows select columns, sorting and conditions
This commit is contained in:
David Grudl
2009-02-05 21:10:50 +00:00
parent 46d79fc305
commit dd6ffc3d0e
2 changed files with 122 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dibi/libs/DibiTranslator.php
View File

@@ -213,8 +213,8 @@ final class DibiTranslator extends DibiObject
$v = $this->formatValue($v, FALSE);
$vx[] = $k . ($v === 'NULL' ? 'IS ' : '= ') . $v;
} elseif ($pair[1] === 'ex') {
$vx[] = $k . $this->formatValue($v, 'sql');
} elseif ($pair[1] === 'ex') { // TODO: this will be removed
$vx[] = $k . $this->formatValue($v, 'ex');
} else {
$v = $this->formatValue($v, $pair[1]);
@@ -222,7 +222,7 @@ final class DibiTranslator extends DibiObject
}
} else {
$vx[] = $this->formatValue($v, 'sql');
$vx[] = $this->formatValue($v, 'ex');
}
}
return implode(' ' . strtoupper($modifier) . ' ', $vx);
@@ -264,6 +264,10 @@ final class DibiTranslator extends DibiObject
return '(' . implode(', ', $kx) . ') VALUES (' . implode(', ', $vx) . ')';
case 'by': // key ASC, key DESC
if (empty($value)) {
return '1';
}
foreach ($value as $k => $v) {
if (is_string($k)) {
$v = (is_string($v) && strncasecmp($v, 'd', 1)) || $v > 0 ? 'ASC' : 'DESC';
@@ -274,6 +278,7 @@ final class DibiTranslator extends DibiObject
}
return implode(', ', $vx);
case 'ex':
case 'sql':
$translator = new self($this->driver);
return $translator->translate($value);
@@ -337,7 +342,8 @@ final class DibiTranslator extends DibiObject
case 'n': // identifier name
return $this->delimite($value);
case 'sql':// preserve as SQL
case 'ex':
case 'sql': // preserve as dibi-SQL (TODO: leave only %ex)
$value = (string) $value;
// speed-up - is regexp required?
$toSkip = strcspn($value, '`[\'"');
@@ -351,6 +357,9 @@ final class DibiTranslator extends DibiObject
);
}
case 'SQL': // preserve as real SQL (TODO: rename to %sql)
return (string) $value;
case 'and':
case 'or':
case 'a':
@@ -496,7 +505,7 @@ final class DibiTranslator extends DibiObject
*/
private function delimite($value)
{
return $this->driver->escape(dibi::substitute($value), dibi::IDENTIFIER);
return $value === '*' ? '*' : $this->driver->escape(dibi::substitute($value), dibi::IDENTIFIER);
}