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

Translator::translate() can be called only once (BC break)

Browse Source
This commit is contained in:
David Grudl
2015-11-02 14:56:47 +01:00
parent 0c22f3b43f
commit 65d6f62a5b
2 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Dibi/Connection.php
View File

@@ -95,7 +95,6 @@ class Connection
$config['name'] = $name;
$this->config = $config;
$this->translator = new Translator($this);
// profiler
$profilerCfg = & $config['profiler'];
@@ -293,7 +292,11 @@ class Connection
private function translateArgs($args)
{
$this->connected || $this->connect();
return $this->translator->translate($args);
if (!$this->translator) {
$this->translator = new Translator($this);
}
$translator = clone $this->translator;
return $translator->translate($args);
}

31
src/Dibi/Translator.php
View File

@@ -22,7 +22,7 @@ final class Translator
private $driver;
/** @var int */
private $cursor;
private $cursor = 0;
/** @var array */
private $args;
@@ -31,13 +31,13 @@ final class Translator
private $errors;
/** @var bool */
private $comment;
private $comment = FALSE;
/** @var int */
private $ifLevel;
private $ifLevel = 0;
/** @var int */
private $ifLevelStart;
private $ifLevelStart = 0;
/** @var int */
private $limit;
@@ -52,41 +52,29 @@ final class Translator
public function __construct(Connection $connection)
{
$this->connection = $connection;
$this->driver = $connection->getDriver();
$this->identifiers = new HashMap([$this, 'delimite']);
}
/**
* Generates SQL.
* Generates SQL. Can be called only once.
* @param array
* @return string
* @throws Exception
*/
public function translate(array $args)
{
if (!$this->driver) {
$this->driver = $this->connection->getDriver();
}
$args = array_values($args);
while (count($args) === 1 && is_array($args[0])) { // implicit array expansion
$args = array_values($args[0]);
}
$this->args = $args;
$this->limit = NULL;
$this->offset = NULL;
$this->errors = [];
$commandIns = NULL;
$lastArr = NULL;
// shortcuts
$cursor = & $this->cursor;
$cursor = 0;
// conditional sql
$this->ifLevel = $this->ifLevelStart = 0;
$comment = & $this->comment;
$comment = FALSE;
// iterate
$sql = [];
@@ -189,10 +177,6 @@ final class Translator
return '...';
}
if (!$this->driver) {
$this->driver = $this->connection->getDriver();
}
// array processing (with or without modifier)
if ($value instanceof \Traversable) {
$value = iterator_to_array($value);
@@ -316,8 +300,7 @@ final class Translator
case 'ex':
case 'sql':
$translator = new self($this->connection);
return $translator->translate($value);
return call_user_func_array([$this->connection, 'translate'], $value);
default: // value, value, value - all with the same modifier
foreach ($value as $v) {