mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-02 12:21:06 +02:00
Code Issues Releases Wiki Activity

Translator: improved Expression usage

Browse Source
This commit is contained in:
David Grudl
2018-04-06 02:56:22 +02:00
parent ccc035c8fb
commit cf0129a194
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Dibi/Translator.php
View File

@@ -316,7 +316,11 @@ final class Translator
if ($modifier) { if ($modifier) {
if ($value !== null && !is_scalar($value)) { // array is already processed if ($value !== null && !is_scalar($value)) { // array is already processed
if ($value instanceof Literal && ($modifier === 'sql' || $modifier === 'SQL')) { if ($value instanceof Literal && ($modifier === 'sql' || $modifier === 'SQL')) {
$modifier = 'SQL'; return (string) $value;
} elseif ($value instanceof Expression && $modifier === 'ex') {
return $this->connection->translate(...$value->getValues());
} elseif ($value instanceof \DateTimeInterface && ($modifier === 'd' || $modifier === 't' || $modifier === 'dt')) { } elseif ($value instanceof \DateTimeInterface && ($modifier === 'd' || $modifier === 't' || $modifier === 'dt')) {
// continue // continue
} else { } else {

12
tests/dibi/Translator.phpt
View File

@@ -507,6 +507,18 @@ Assert::same(
); );
Assert::same(
reformat('SELECT * FROM [table] WHERE (([left] = 1) OR ([top] = 2)) AND (number < 100)'),
$conn->translate('SELECT * FROM `table` WHERE %and', [
new Dibi\Expression('%or', [
'left' => 1,
'top' => 2,
]),
new Dibi\Expression('number < %i', 100),
])
);
$e = Assert::exception(function () use ($conn) { $e = Assert::exception(function () use ($conn) {
$array6 = [ $array6 = [
'id' => [1, 2, 3, 4], 'id' => [1, 2, 3, 4],