RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 07:06:04 +03:00
Code Issues Projects Releases Wiki Activity

renaming all DB references to Db

Browse Source
This commit is contained in:
pookey 2006-11-06 18:00:35 +00:00
parent 4e0476f20d
commit 60985b5697
22 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/Configurable.php
View File

@ -142,8 +142,8 @@ abstract class Doctrine_Configurable {
/** /**
* addListener * addListener
* *
* @param Doctrine_DB_EventListener_Interface|Doctrine_Overloadable $listener * @param Doctrine_Db_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_DB * @return Doctrine_Db
*/ */
public function addListener($listener, $name = null) { public function addListener($listener, $name = null) {
if( ! ($this->attributes[Doctrine::ATTR_LISTENER] instanceof Doctrine_EventListener_Chain)) if( ! ($this->attributes[Doctrine::ATTR_LISTENER] instanceof Doctrine_EventListener_Chain))
@ -156,7 +156,7 @@ abstract class Doctrine_Configurable {
/** /**
* getListener * getListener
* *
* @return Doctrine_DB_EventListener_Interface|Doctrine_Overloadable * @return Doctrine_Db_EventListener_Interface|Doctrine_Overloadable
*/ */
public function getListener() { public function getListener() {
if( ! isset($this->attributes[Doctrine::ATTR_LISTENER])) { if( ! isset($this->attributes[Doctrine::ATTR_LISTENER])) {
@ -170,8 +170,8 @@ abstract class Doctrine_Configurable {
/** /**
* setListener * setListener
* *
* @param Doctrine_DB_EventListener_Interface|Doctrine_Overloadable $listener * @param Doctrine_Db_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_DB * @return Doctrine_Db
*/ */
public function setListener($listener) { public function setListener($listener) {
if( ! ($listener instanceof Doctrine_EventListener_Interface) && if( ! ($listener instanceof Doctrine_EventListener_Interface) &&

8
lib/Doctrine/DB/EventListener.php
View File

@ -19,13 +19,13 @@
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
/** /**
* Doctrine_DB_EventListener * Doctrine_Db_EventListener
* *
* @author Konsta Vesterinen * @author Konsta Vesterinen
* @license LGPL * @license LGPL
* @package Doctrine * @package Doctrine
*/ */
class Doctrine_DB_EventListener implements Doctrine_DB_EventListener_Interface { class Doctrine_Db_EventListener implements Doctrine_Db_EventListener_Interface {
public function onPreQuery(Doctrine_DB2 $dbh, $statement, array $args) { } public function onPreQuery(Doctrine_DB2 $dbh, $statement, array $args) { }
public function onQuery(Doctrine_DB2 $dbh, $statement, array $args, $queryId) { } public function onQuery(Doctrine_DB2 $dbh, $statement, array $args, $queryId) { }
@ -44,6 +44,6 @@ class Doctrine_DB_EventListener implements Doctrine_DB_EventListener_Interface {
public function onPreBeginTransaction(Doctrine_DB2 $dbh) { } public function onPreBeginTransaction(Doctrine_DB2 $dbh) { }
public function onBeginTransaction(Doctrine_DB2 $dbh) { } public function onBeginTransaction(Doctrine_DB2 $dbh) { }
public function onPreExecute(Doctrine_DB_Statement $stmt, array $params) { } public function onPreExecute(Doctrine_Db_Statement $stmt, array $params) { }
public function onExecute(Doctrine_DB_Statement $stmt, array $params) { } public function onExecute(Doctrine_Db_Statement $stmt, array $params) { }
} }

18
lib/Doctrine/DB/EventListener/Chain.php
View File

@ -19,19 +19,19 @@
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
/** /**
* Doctrine_DB_EventListener * Doctrine_Db_EventListener
* *
* @author Konsta Vesterinen * @author Konsta Vesterinen
* @license LGPL * @license LGPL
* @package Doctrine * @package Doctrine
*/ */
class Doctrine_DB_EventListener_Chain extends Doctrine_Access implements Doctrine_DB_EventListener_Interface { class Doctrine_Db_EventListener_Chain extends Doctrine_Access implements Doctrine_DB_EventListener_Interface {
private $listeners = array(); private $listeners = array();
public function add($listener, $name = null) { public function add($listener, $name = null) {
if( ! ($listener instanceof Doctrine_DB_EventListener_Interface) && if( ! ($listener instanceof Doctrine_Db_EventListener_Interface) &&
! ($listener instanceof Doctrine_Overloadable)) ! ($listener instanceof Doctrine_Overloadable))
throw new Doctrine_DB_Exception("Couldn't add eventlistener. EventListeners should implement either Doctrine_DB_EventListener_Interface or Doctrine_Overloadable"); throw new Doctrine_Db_Exception("Couldn't add eventlistener. EventListeners should implement either Doctrine_DB_EventListener_Interface or Doctrine_Overloadable");
if($name === null) if($name === null)
$this->listeners[] = $listener; $this->listeners[] = $listener;
@ -41,15 +41,15 @@ class Doctrine_DB_EventListener_Chain extends Doctrine_Access implements Doctrin
public function get($name) { public function get($name) {
if( ! isset($this->listeners[$name])) if( ! isset($this->listeners[$name]))
throw new Doctrine_DB_Exception("Unknown listener $name"); throw new Doctrine_Db_Exception("Unknown listener $name");
return $this->listeners[$name]; return $this->listeners[$name];
} }
public function set($name, $listener) { public function set($name, $listener) {
if( ! ($listener instanceof Doctrine_DB_EventListener_Interface) && if( ! ($listener instanceof Doctrine_Db_EventListener_Interface) &&
! ($listener instanceof Doctrine_Overloadable)) ! ($listener instanceof Doctrine_Overloadable))
throw new Doctrine_DB_Exception("Couldn't set eventlistener. EventListeners should implement either Doctrine_DB_EventListener_Interface or Doctrine_Overloadable"); throw new Doctrine_Db_Exception("Couldn't set eventlistener. EventListeners should implement either Doctrine_DB_EventListener_Interface or Doctrine_Overloadable");
$this->listeners[$name] = $listener; $this->listeners[$name] = $listener;
} }
@ -120,12 +120,12 @@ class Doctrine_DB_EventListener_Chain extends Doctrine_Access implements Doctrin
} }
} }
public function onPreExecute(Doctrine_DB_Statement $stmt, array $params) { public function onPreExecute(Doctrine_Db_Statement $stmt, array $params) {
foreach($this->listeners as $listener) { foreach($this->listeners as $listener) {
$listener->onPreExecute($stmt, $params); $listener->onPreExecute($stmt, $params);
} }
} }
public function onExecute(Doctrine_DB_Statement $stmt, array $params) { public function onExecute(Doctrine_Db_Statement $stmt, array $params) {
foreach($this->listeners as $listener) { foreach($this->listeners as $listener) {
$listener->onExecute($stmt, $params); $listener->onExecute($stmt, $params);
} }

8
lib/Doctrine/DB/EventListener/Interface.php
View File

@ -19,13 +19,13 @@
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
/** /**
* Doctrine_DB_EventListener * Doctrine_Db_EventListener
* *
* @author Konsta Vesterinen * @author Konsta Vesterinen
* @license LGPL * @license LGPL
* @package Doctrine * @package Doctrine
*/ */
interface Doctrine_DB_EventListener_Interface { interface Doctrine_Db_EventListener_Interface {
public function onPreQuery(Doctrine_DB2 $dbh, $statement, array $args); public function onPreQuery(Doctrine_DB2 $dbh, $statement, array $args);
public function onQuery(Doctrine_DB2 $dbh, $statement, array $args, $queryId); public function onQuery(Doctrine_DB2 $dbh, $statement, array $args, $queryId);
@ -44,6 +44,6 @@ interface Doctrine_DB_EventListener_Interface {
public function onPreBeginTransaction(Doctrine_DB2 $dbh); public function onPreBeginTransaction(Doctrine_DB2 $dbh);
public function onBeginTransaction(Doctrine_DB2 $dbh); public function onBeginTransaction(Doctrine_DB2 $dbh);
public function onPreExecute(Doctrine_DB_Statement $stmt, array $params); public function onPreExecute(Doctrine_Db_Statement $stmt, array $params);
public function onExecute(Doctrine_DB_Statement $stmt, array $params); public function onExecute(Doctrine_Db_Statement $stmt, array $params);
} }

4
lib/Doctrine/DB/Exception.php
View File

@ -19,10 +19,10 @@
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
/** /**
* Doctrine_DB_Exception * Doctrine_Db_Exception
* *
* @author Konsta Vesterinen * @author Konsta Vesterinen
* @license LGPL * @license LGPL
* @package Doctrine * @package Doctrine
*/ */
class Doctrine_DB_Exception extends Doctrine_Exception { } class Doctrine_Db_Exception extends Doctrine_Exception { }

4
lib/Doctrine/DB/Firebird.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
Doctrine::autoload('Doctrine_DB'); Doctrine::autoload('Doctrine_Db');
/** /**
* @package Doctrine * @package Doctrine
* @url http://www.phpdoctrine.com * @url http://www.phpdoctrine.com
@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library) * @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$ * @version $Id$
*/ */
class Doctrine_DB_Firebird extends Doctrine_DB { class Doctrine_Db_Firebird extends Doctrine_Db {
} }

4
lib/Doctrine/DB/Informix.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
Doctrine::autoload('Doctrine_DB'); Doctrine::autoload('Doctrine_Db');
/** /**
* @package Doctrine * @package Doctrine
* @url http://www.phpdoctrine.com * @url http://www.phpdoctrine.com
@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library) * @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$ * @version $Id$
*/ */
class Doctrine_DB_Informix extends Doctrine_DB { class Doctrine_Db_Informix extends Doctrine_Db {
} }

14
lib/Doctrine/DB/LazyConnector.php
View File

@ -19,30 +19,30 @@
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
/** /**
* Doctrine_DB_LazyConnector * Doctrine_Db_LazyConnector
* *
* @author Konsta Vesterinen * @author Konsta Vesterinen
* @license LGPL * @license LGPL
* @package Doctrine * @package Doctrine
*/ */
class Doctrine_DB_LazyConnector extends Doctrine_DB_EventListener { class Doctrine_Db_LazyConnector extends Doctrine_Db_EventListener {
public function onPreQuery(Doctrine_DB $dbh, array $args) { public function onPreQuery(Doctrine_Db $dbh, array $args) {
$dbh->connect(); $dbh->connect();
} }
public function onPrePrepare(Doctrine_DB $dbh, array $args) { public function onPrePrepare(Doctrine_Db $dbh, array $args) {
$dbh->connect(); $dbh->connect();
} }
public function onPreCommit(Doctrine_DB $dbh) { public function onPreCommit(Doctrine_Db $dbh) {
$dbh->connect(); $dbh->connect();
} }
public function onPreRollBack(Doctrine_DB $dbh) { public function onPreRollBack(Doctrine_Db $dbh) {
$dbh->connect(); $dbh->connect();
} }
public function onPreBeginTransaction(Doctrine_DB $dbh) { public function onPreBeginTransaction(Doctrine_Db $dbh) {
$dbh->connect(); $dbh->connect();
} }
} }

4
lib/Doctrine/DB/Mssql.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
Doctrine::autoload('Doctrine_DB'); Doctrine::autoload('Doctrine_Db');
/** /**
* @package Doctrine * @package Doctrine
* @url http://www.phpdoctrine.com * @url http://www.phpdoctrine.com
@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library) * @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$ * @version $Id$
*/ */
class Doctrine_DB_Mssql extends Doctrine_DB { class Doctrine_Db_Mssql extends Doctrine_Db {
} }

4
lib/Doctrine/DB/Mysql.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
Doctrine::autoload('Doctrine_DB'); Doctrine::autoload('Doctrine_Db');
/** /**
* @package Doctrine * @package Doctrine
* @url http://www.phpdoctrine.com * @url http://www.phpdoctrine.com
@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library) * @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$ * @version $Id$
*/ */
class Doctrine_DB_Mysql extends Doctrine_DB { class Doctrine_Db_Mysql extends Doctrine_Db {
} }

4
lib/Doctrine/DB/Oracle.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
Doctrine::autoload('Doctrine_DB'); Doctrine::autoload('Doctrine_Db');
/** /**
* @package Doctrine * @package Doctrine
* @url http://www.phpdoctrine.com * @url http://www.phpdoctrine.com
@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library) * @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$ * @version $Id$
*/ */
class Doctrine_DB_Oracle extends Doctrine_DB { class Doctrine_Db_Oracle extends Doctrine_Db {
} }

4
lib/Doctrine/DB/Pgsql.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
Doctrine::autoload('Doctrine_DB'); Doctrine::autoload('Doctrine_Db');
/** /**
* @package Doctrine * @package Doctrine
* @url http://www.phpdoctrine.com * @url http://www.phpdoctrine.com
@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library) * @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$ * @version $Id$
*/ */
class Doctrine_DB_Pgsql extends Doctrine_DB { class Doctrine_Db_Pgsql extends Doctrine_Db {
} }

10
lib/Doctrine/DB/Profiler.php
View File

@ -19,13 +19,13 @@
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
/** /**
* Doctrine_DB_Profiler * Doctrine_Db_Profiler
* *
* @author Konsta Vesterinen * @author Konsta Vesterinen
* @license LGPL * @license LGPL
* @package Doctrine * @package Doctrine
*/ */
class Doctrine_DB_Profiler extends Doctrine_DB_EventListener { class Doctrine_Db_Profiler extends Doctrine_Db_EventListener {
public function onPreQuery(Doctrine_DB2 $dbh, $statement, array $args) { public function onPreQuery(Doctrine_DB2 $dbh, $statement, array $args) {
$this->queryStart($statement); $this->queryStart($statement);
} }
@ -49,10 +49,10 @@ class Doctrine_DB_Profiler extends Doctrine_DB_EventListener {
public function onPreBeginTransaction(Doctrine_DB2 $dbh) { } public function onPreBeginTransaction(Doctrine_DB2 $dbh) { }
public function onBeginTransaction(Doctrine_DB2 $dbh) { } public function onBeginTransaction(Doctrine_DB2 $dbh) { }
public function onPreExecute(Doctrine_DB_Statement $stmt, array $params) { public function onPreExecute(Doctrine_Db_Statement $stmt, array $params) {
$this->queryStart($stmt->getQuery(), $stmt->getQuerySequence()); $this->queryStart($stmt->getQuery(), $stmt->getQuerySequence());
} }
public function onExecute(Doctrine_DB_Statement $stmt, array $params) { public function onExecute(Doctrine_Db_Statement $stmt, array $params) {
$this->queryEnd($stmt->getQuerySequence()); $this->queryEnd($stmt->getQuerySequence());
} }
/** /**
@ -100,7 +100,7 @@ class Doctrine_DB_Profiler extends Doctrine_DB_EventListener {
public function queryStart($queryText, $querySequence = -1) { public function queryStart($queryText, $querySequence = -1) {
$prepareTime = (isset($this->prepareTimes[$querySequence])) ? $this->prepareTimes[$querySequence] : null; $prepareTime = (isset($this->prepareTimes[$querySequence])) ? $this->prepareTimes[$querySequence] : null;
$this->_queryProfiles[] = new Doctrine_DB_Profiler_Query($queryText, $prepareTime); $this->_queryProfiles[] = new Doctrine_Db_Profiler_Query($queryText, $prepareTime);
} }
/** /**
* Ends a query. Pass it the handle that was returned by queryStart(). * Ends a query. Pass it the handle that was returned by queryStart().

4
lib/Doctrine/DB/Profiler/Query.php
View File

@ -20,13 +20,13 @@
*/ */
/** /**
* Doctrine_DB_Profiler_Query * Doctrine_Db_Profiler_Query
* *
* @author Konsta Vesterinen * @author Konsta Vesterinen
* @license LGPL * @license LGPL
* @package Doctrine * @package Doctrine
*/ */
class Doctrine_DB_Profiler_Query { class Doctrine_Db_Profiler_Query {
/** /**
* @var string SQL query string or user comment, set by $query argument in constructor. * @var string SQL query string or user comment, set by $query argument in constructor.
*/ */

4
lib/Doctrine/DB/Sqlite.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
Doctrine::autoload('Doctrine_DB'); Doctrine::autoload('Doctrine_Db');
/** /**
* @package Doctrine * @package Doctrine
* @url http://www.phpdoctrine.com * @url http://www.phpdoctrine.com
@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library) * @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$ * @version $Id$
*/ */
class Doctrine_DB_Sqlite extends Doctrine_DB { class Doctrine_Db_Sqlite extends Doctrine_Db {
} }

4
lib/Doctrine/DB/Statement.php
View File

@ -19,13 +19,13 @@
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
/** /**
* Doctrine_DB_Statement * Doctrine_Db_Statement
* *
* @author Konsta Vesterinen * @author Konsta Vesterinen
* @license LGPL * @license LGPL
* @package Doctrine * @package Doctrine
*/ */
class Doctrine_DB_Statement extends PDOStatement { class Doctrine_Db_Statement extends PDOStatement {
protected $dbh; protected $dbh;
protected $querySequence; protected $querySequence;

8
lib/Doctrine/DB.php → lib/Doctrine/Db.php
View File

@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see * and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>. * <http://www.phpdoctrine.com>.
*/ */
class Doctrine_DB extends PDO implements Countable, IteratorAggregate { class Doctrine_Db extends PDO implements Countable, IteratorAggregate {
/** /**
* default DSN * default DSN
*/ */
@ -41,7 +41,7 @@ class Doctrine_DB extends PDO implements Countable, IteratorAggregate {
public function __construct($dsn,$username,$password) { public function __construct($dsn,$username,$password) {
parent::__construct($dsn,$username,$password); parent::__construct($dsn,$username,$password);
$this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array("Doctrine_DBStatement",array($this))); $this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array("Doctrine_DbStatement",array($this)));
} }
@ -49,7 +49,7 @@ class Doctrine_DB extends PDO implements Countable, IteratorAggregate {
static $instance; static $instance;
if( ! isset($instance)) { if( ! isset($instance)) {
$instance = new Doctrine_DB($dsn,$username,$password); $instance = new Doctrine_Db($dsn,$username,$password);
} }
return $instance; return $instance;
} }
@ -74,7 +74,7 @@ class Doctrine_DB extends PDO implements Countable, IteratorAggregate {
$e[1] = $a["user"]; $e[1] = $a["user"];
$e[2] = $a["pass"]; $e[2] = $a["pass"];
$instance[$md5] = new Doctrine_DB($e[0],$e[1],$e[2]); $instance[$md5] = new Doctrine_Db($e[0],$e[1],$e[2]);
} }
return $instance[$md5]; return $instance[$md5];
} }

0
lib/Doctrine/DBStatement.php → lib/Doctrine/DbStatement.php
View File

2
lib/Doctrine/Export.php
View File

@ -32,7 +32,7 @@ class Doctrine_Export {
*/ */
private $conn; private $conn;
/** /**
* @var mixed $dbh the database handler (either PDO or Doctrine_DB object) * @var mixed $dbh the database handler (either PDO or Doctrine_Db object)
*/ */
private $dbh; private $dbh;

2
lib/Doctrine/Lib.php
View File

@ -100,7 +100,7 @@ class Doctrine_Lib {
$r[] = "Table in memory : ".$connection->count(); $r[] = "Table in memory : ".$connection->count();
$queries = false; $queries = false;
if($connection->getDBH() instanceof Doctrine_DB) { if($connection->getDBH() instanceof Doctrine_Db) {
$handler = "Doctrine Database Handler"; $handler = "Doctrine Database Handler";
$queries = count($connection->getDBH()->getQueries()); $queries = count($connection->getDBH()->getQueries());
$sum = array_sum($connection->getDBH()->getExecTimes()); $sum = array_sum($connection->getDBH()->getExecTimes());

2
lib/Doctrine/Manager.php
View File

@ -198,7 +198,7 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
public function getConnection($name) { public function getConnection($name) {
if (!isset($this->connections[$name])) { if (!isset($this->connections[$name])) {
if (isset($this->dataSourceNames[$name])) { if (isset($this->dataSourceNames[$name])) {
$conn = Doctrine_DB::getConnection($this->dataSourceNames[$name]); // Establishes the connection $conn = Doctrine_Db::getConnection($this->dataSourceNames[$name]); // Establishes the connection
$this->openConnection($conn, $name); $this->openConnection($conn, $name);
} else { } else {
throw new Doctrine_Manager_Exception("Unknown connection: $name"); throw new Doctrine_Manager_Exception("Unknown connection: $name");

10
lib/Doctrine/Record.php
View File

@ -1329,8 +1329,8 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
/** /**
* addListener * addListener
* *
* @param Doctrine_DB_EventListener_Interface|Doctrine_Overloadable $listener * @param Doctrine_Db_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_DB * @return Doctrine_Db
*/ */
public function addListener($listener, $name = null) { public function addListener($listener, $name = null) {
$this->_table->addListener($listener, $name = null); $this->_table->addListener($listener, $name = null);
@ -1339,7 +1339,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
/** /**
* getListener * getListener
* *
* @return Doctrine_DB_EventListener_Interface|Doctrine_Overloadable * @return Doctrine_Db_EventListener_Interface|Doctrine_Overloadable
*/ */
public function getListener() { public function getListener() {
return $this->_table->getListener(); return $this->_table->getListener();
@ -1347,8 +1347,8 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
/** /**
* setListener * setListener
* *
* @param Doctrine_DB_EventListener_Interface|Doctrine_Overloadable $listener * @param Doctrine_Db_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_DB * @return Doctrine_Db
*/ */
public function setListener($listener) { public function setListener($listener) {
$this->_table->setListener($listener); $this->_table->setListener($listener);