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

DibiConnection refactoring

Browse Source
This commit is contained in:
David Grudl
2011-01-24 20:53:24 +01:00
parent 0b1547818d
commit 88cccc0543
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dibi/libs/DibiConnection.php
View File

@@ -247,24 +247,22 @@ class DibiConnection extends DibiObject
*/ */
final public function query($args) final public function query($args)
{ {
$this->connected || $this->connect();
$args = func_get_args(); $args = func_get_args();
return $this->nativeQuery($this->translator->translate($args)); return $this->nativeQuery($this->translateArgs($args));
} }
/** /**
* Generates and returns SQL query. * Generates SQL query.
* @param array|mixed one or more arguments * @param array|mixed one or more arguments
* @return string * @return string
* @throws DibiException * @throws DibiException
*/ */
final public function translate($args) final public function translate($args)
{ {
$this->connected || $this->connect();
$args = func_get_args(); $args = func_get_args();
return $this->translator->translate($args); return $this->translateArgs($args);
} }
@@ -273,9 +271,8 @@ class DibiConnection extends DibiObject
function sql($args) function sql($args)
{ {
trigger_error(__METHOD__ . '() is deprecated; use translate() instead.', E_USER_NOTICE); trigger_error(__METHOD__ . '() is deprecated; use translate() instead.', E_USER_NOTICE);
$this->connected || $this->connect();
$args = func_get_args(); $args = func_get_args();
return $this->translator->translate($args); return $this->translateArgs($args);
} }
@@ -287,10 +284,9 @@ class DibiConnection extends DibiObject
*/ */
final public function test($args) final public function test($args)
{ {
$this->connected || $this->connect();
$args = func_get_args(); $args = func_get_args();
try { try {
dibi::dump($this->translator->translate($args)); dibi::dump($this->translateArgs($args));
return TRUE; return TRUE;
} catch (DibiException $e) { } catch (DibiException $e) {
@@ -309,9 +305,21 @@ class DibiConnection extends DibiObject
*/ */
final public function dataSource($args) final public function dataSource($args)
{ {
$this->connected || $this->connect();
$args = func_get_args(); $args = func_get_args();
return new DibiDataSource($this->translator->translate($args), $this); return new DibiDataSource($this->translateArgs($args), $this);
}
/**
* Generates SQL query.
* @param array
* @return string
*/
private function translateArgs($args)
{
$this->connected || $this->connect();
return $this->translator->translate($args);
} }