From 65d4158c71e365cf6f804470d1e64c29b6aa85a8 Mon Sep 17 00:00:00 2001 From: zYne Date: Wed, 1 Nov 2006 11:25:53 +0000 Subject: [PATCH] Removed getState() and concat() methods from mysql driver, getState() is not needed (it resides at transaction class) and concat is located at mysql expression driver --- lib/Doctrine/Connection/Firebird.php | 2 +- lib/Doctrine/Connection/Mysql.php | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/lib/Doctrine/Connection/Firebird.php b/lib/Doctrine/Connection/Firebird.php index 98564fd01..64d09bc10 100644 --- a/lib/Doctrine/Connection/Firebird.php +++ b/lib/Doctrine/Connection/Firebird.php @@ -85,7 +85,7 @@ class Doctrine_Connection_Firebird extends Doctrine_Connection { * 'rw' => 'READ WRITE' | 'READ ONLY' * @return void */ - function setTransactionIsolation($isolation, $options = array()) { + public function setTransactionIsolation($isolation, $options = array()) { switch ($isolation) { case 'READ UNCOMMITTED': $ibase_isolation = 'READ COMMITTED RECORD_VERSION'; diff --git a/lib/Doctrine/Connection/Mysql.php b/lib/Doctrine/Connection/Mysql.php index c2efa8090..057ce1d99 100644 --- a/lib/Doctrine/Connection/Mysql.php +++ b/lib/Doctrine/Connection/Mysql.php @@ -111,26 +111,4 @@ class Doctrine_Connection_Mysql extends Doctrine_Connection_Common { $query = "SET SESSION TRANSACTION ISOLATION LEVEL $isolation"; return $this->dbh->query($query); } - /** - * Returns string to concatenate two or more string parameters - * - * @param string $value1 - * @param string $value2 - * @param string $values... - * @return string a concatenation of two or more strings - */ - public function concat($value1, $value2) { - $args = func_get_args(); - return "CONCAT(".implode(', ', $args).")"; - } - /** - * returns the state of this connection - * - * @see Doctrine_Connection_Transaction::STATE_* constants - * @return integer the connection state - */ - public function getState() { - return 0; // @todo FIXME not working! - } } -