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

- added placeholder ?

Browse Source
This commit is contained in:
David Grudl
2009-05-11 18:43:30 +00:00
parent 564a0e534e
commit fb8054d21a
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dibi/libs/DibiTranslator.php
View File

@@ -117,7 +117,7 @@ final class DibiTranslator extends DibiObject
$sql[] = substr($arg, 0, $toSkip) $sql[] = substr($arg, 0, $toSkip)
/* /*
preg_replace_callback('/ preg_replace_callback('/
(?=[`[\'":%]) ## speed-up (?=[`[\'":%?]) ## speed-up
(?: (?:
`(.+?)`| ## 1) `identifier` `(.+?)`| ## 1) `identifier`
\[(.+?)\]| ## 2) [identifier] \[(.+?)\]| ## 2) [identifier]
@@ -126,9 +126,10 @@ final class DibiTranslator extends DibiObject
(\'|")| ## 7) lone quote (\'|")| ## 7) lone quote
:(\S*?:)([a-zA-Z0-9._]?)| ## 8,9) substitution :(\S*?:)([a-zA-Z0-9._]?)| ## 8,9) substitution
%([a-zA-Z]{1,4})(?![a-zA-Z]) ## 10) modifier %([a-zA-Z]{1,4})(?![a-zA-Z]) ## 10) modifier
(\?) ## 11) placeholder
)/xs', )/xs',
*/ // note: this can change $this->args & $this->cursor & ... */ // note: this can change $this->args & $this->cursor & ...
. preg_replace_callback('/(?=[`[\'":%])(?:`(.+?)`|\[(.+?)\]|(\')((?:\'\'|[^\'])*)\'|(")((?:""|[^"])*)"|(\'|")|:(\S*?:)([a-zA-Z0-9._]?)|%([a-zA-Z]{1,4})(?![a-zA-Z]))/s', . preg_replace_callback('/(?=[`[\'":%?])(?:`(.+?)`|\[(.+?)\]|(\')((?:\'\'|[^\'])*)\'|(")((?:""|[^"])*)"|(\'|")|:(\S*?:)([a-zA-Z0-9._]?)|%([a-zA-Z]{1,4})(?![a-zA-Z])|(\?))/s',
array($this, 'cb'), array($this, 'cb'),
substr($arg, $toSkip) substr($arg, $toSkip)
); );
@@ -397,6 +398,9 @@ final class DibiTranslator extends DibiObject
if ($value instanceof IDibiVariable) if ($value instanceof IDibiVariable)
return $value->toSql($this, NULL); return $value->toSql($this, NULL);
if ($value instanceof DateTime)
return $value = $value->format('U');
$this->hasError = TRUE; $this->hasError = TRUE;
return '**Unexpected ' . gettype($value) . '**'; return '**Unexpected ' . gettype($value) . '**';
} }
@@ -420,6 +424,20 @@ final class DibiTranslator extends DibiObject
// [8] => substitution // [8] => substitution
// [9] => substitution flag // [9] => substitution flag
// [10] => modifier (when called from self::translate()) // [10] => modifier (when called from self::translate())
// [11] => placeholder (when called from self::translate())
if (!empty($matches[11])) { // placeholder
$cursor = & $this->cursor;
if ($cursor >= count($this->args)) {
$this->hasError = TRUE;
return "**Extra placeholder**";
}
$cursor++;
return $this->formatValue($this->args[$cursor - 1], FALSE);
}
if (!empty($matches[10])) { // modifier if (!empty($matches[10])) { // modifier
$mod = $matches[10]; $mod = $matches[10];