Skip to content

D
doctrine-dbal
Commit 60985b56 authored by pookey's avatar pookey
Browse files
Options

renaming all DB references to Db

parent 4e0476f2
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 66 deletions
lib/Doctrine/Configurable.php
View file @ 60985b56
......@@ -142,8 +142,8 @@ abstract class Doctrine_Configurable {
/**
* addListener
*
* @param Doctrine_DB_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_DB
* @param Doctrine_Db_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_Db
*/
public function addListener($listener, $name = null) {
if( ! ($this->attributes[Doctrine::ATTR_LISTENER] instanceof Doctrine_EventListener_Chain))
......@@ -156,7 +156,7 @@ abstract class Doctrine_Configurable {
/**
* getListener
*
* @return Doctrine_DB_EventListener_Interface|Doctrine_Overloadable
* @return Doctrine_Db_EventListener_Interface|Doctrine_Overloadable
*/
public function getListener() {
if( ! isset($this->attributes[Doctrine::ATTR_LISTENER])) {
......@@ -170,8 +170,8 @@ abstract class Doctrine_Configurable {
/**
* setListener
*
* @param Doctrine_DB_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_DB
* @param Doctrine_Db_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_Db
*/
public function setListener($listener) {
if( ! ($listener instanceof Doctrine_EventListener_Interface) &&
......
lib/Doctrine/DB/EventListener.php
View file @ 60985b56
......@@ -19,13 +19,13 @@
* <http://www.phpdoctrine.com>.
*/
/**
* Doctrine_DB_EventListener
* Doctrine_Db_EventListener
*
* @author Konsta Vesterinen
* @license LGPL
* @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 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 onBeginTransaction(Doctrine_DB2 $dbh) { }
public function onPreExecute(Doctrine_DB_Statement $stmt, array $params) { }
public function onExecute(Doctrine_DB_Statement $stmt, array $params) { }
public function onPreExecute(Doctrine_Db_Statement $stmt, array $params) { }
public function onExecute(Doctrine_Db_Statement $stmt, array $params) { }
}
lib/Doctrine/DB/EventListener/Chain.php
View file @ 60985b56
......@@ -19,19 +19,19 @@
* <http://www.phpdoctrine.com>.
*/
/**
* Doctrine_DB_EventListener
* Doctrine_Db_EventListener
*
* @author Konsta Vesterinen
* @license LGPL
* @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();
public function add($listener, $name = null) {
if( ! ($listener instanceof Doctrine_DB_EventListener_Interface) &&
if( ! ($listener instanceof Doctrine_Db_EventListener_Interface) &&
! ($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)
$this->listeners[] = $listener;
......@@ -41,15 +41,15 @@ class Doctrine_DB_EventListener_Chain extends Doctrine_Access implements Doctrin
public function get($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];
}
public function set($name, $listener) {
if( ! ($listener instanceof Doctrine_DB_EventListener_Interface) &&
if( ! ($listener instanceof Doctrine_Db_EventListener_Interface) &&
! ($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;
}
......@@ -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) {
$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) {
$listener->onExecute($stmt, $params);
}
......
lib/Doctrine/DB/EventListener/Interface.php
View file @ 60985b56
......@@ -19,13 +19,13 @@
* <http://www.phpdoctrine.com>.
*/
/**
* Doctrine_DB_EventListener
* Doctrine_Db_EventListener
*
* @author Konsta Vesterinen
* @license LGPL
* @package Doctrine
*/
interface Doctrine_DB_EventListener_Interface {
interface Doctrine_Db_EventListener_Interface {
public function onPreQuery(Doctrine_DB2 $dbh, $statement, array $args);
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 onBeginTransaction(Doctrine_DB2 $dbh);
public function onPreExecute(Doctrine_DB_Statement $stmt, array $params);
public function onExecute(Doctrine_DB_Statement $stmt, array $params);
public function onPreExecute(Doctrine_Db_Statement $stmt, array $params);
public function onExecute(Doctrine_Db_Statement $stmt, array $params);
}
lib/Doctrine/DB/Exception.php
View file @ 60985b56
......@@ -19,10 +19,10 @@
* <http://www.phpdoctrine.com>.
*/
/**
* Doctrine_DB_Exception
* Doctrine_Db_Exception
*
* @author Konsta Vesterinen
* @license LGPL
* @package Doctrine
*/
class Doctrine_DB_Exception extends Doctrine_Exception { }
class Doctrine_Db_Exception extends Doctrine_Exception { }
lib/Doctrine/DB/Firebird.php
View file @ 60985b56
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>.
*/
Doctrine::autoload('Doctrine_DB');
Doctrine::autoload('Doctrine_Db');
/**
* @package Doctrine
* @url http://www.phpdoctrine.com
......@@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$
*/
class Doctrine_DB_Firebird extends Doctrine_DB {
class Doctrine_Db_Firebird extends Doctrine_Db {
}
lib/Doctrine/DB/Informix.php
View file @ 60985b56
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>.
*/
Doctrine::autoload('Doctrine_DB');
Doctrine::autoload('Doctrine_Db');
/**
* @package Doctrine
* @url http://www.phpdoctrine.com
......@@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$
*/
class Doctrine_DB_Informix extends Doctrine_DB {
class Doctrine_Db_Informix extends Doctrine_Db {
}
lib/Doctrine/DB/LazyConnector.php
View file @ 60985b56
......@@ -19,30 +19,30 @@
* <http://www.phpdoctrine.com>.
*/
/**
* Doctrine_DB_LazyConnector
* Doctrine_Db_LazyConnector
*
* @author Konsta Vesterinen
* @license LGPL
* @package Doctrine
*/
class Doctrine_DB_LazyConnector extends Doctrine_DB_EventListener {
public function onPreQuery(Doctrine_DB $dbh, array $args) {
class Doctrine_Db_LazyConnector extends Doctrine_Db_EventListener {
public function onPreQuery(Doctrine_Db $dbh, array $args) {
$dbh->connect();
}
public function onPrePrepare(Doctrine_DB $dbh, array $args) {
public function onPrePrepare(Doctrine_Db $dbh, array $args) {
$dbh->connect();
}
public function onPreCommit(Doctrine_DB $dbh) {
public function onPreCommit(Doctrine_Db $dbh) {
$dbh->connect();
}
public function onPreRollBack(Doctrine_DB $dbh) {
public function onPreRollBack(Doctrine_Db $dbh) {
$dbh->connect();
}
public function onPreBeginTransaction(Doctrine_DB $dbh) {
public function onPreBeginTransaction(Doctrine_Db $dbh) {
$dbh->connect();
}
}
lib/Doctrine/DB/Mssql.php
View file @ 60985b56
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>.
*/
Doctrine::autoload('Doctrine_DB');
Doctrine::autoload('Doctrine_Db');
/**
* @package Doctrine
* @url http://www.phpdoctrine.com
......@@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$
*/
class Doctrine_DB_Mssql extends Doctrine_DB {
class Doctrine_Db_Mssql extends Doctrine_Db {
}
lib/Doctrine/DB/Mysql.php
View file @ 60985b56
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>.
*/
Doctrine::autoload('Doctrine_DB');
Doctrine::autoload('Doctrine_Db');
/**
* @package Doctrine
* @url http://www.phpdoctrine.com
......@@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$
*/
class Doctrine_DB_Mysql extends Doctrine_DB {
class Doctrine_Db_Mysql extends Doctrine_Db {
}
lib/Doctrine/DB/Oracle.php
View file @ 60985b56
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>.
*/
Doctrine::autoload('Doctrine_DB');
Doctrine::autoload('Doctrine_Db');
/**
* @package Doctrine
* @url http://www.phpdoctrine.com
......@@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$
*/
class Doctrine_DB_Oracle extends Doctrine_DB {
class Doctrine_Db_Oracle extends Doctrine_Db {
}
lib/Doctrine/DB/Pgsql.php
View file @ 60985b56
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>.
*/
Doctrine::autoload('Doctrine_DB');
Doctrine::autoload('Doctrine_Db');
/**
* @package Doctrine
* @url http://www.phpdoctrine.com
......@@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$
*/
class Doctrine_DB_Pgsql extends Doctrine_DB {
class Doctrine_Db_Pgsql extends Doctrine_Db {
}
lib/Doctrine/DB/Profiler.php
View file @ 60985b56
......@@ -19,13 +19,13 @@
* <http://www.phpdoctrine.com>.
*/
/**
* Doctrine_DB_Profiler
* Doctrine_Db_Profiler
*
* @author Konsta Vesterinen
* @license LGPL
* @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) {
$this->queryStart($statement);
}
......@@ -49,10 +49,10 @@ class Doctrine_DB_Profiler extends Doctrine_DB_EventListener {
public function onPreBeginTransaction(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());
}
public function onExecute(Doctrine_DB_Statement $stmt, array $params) {
public function onExecute(Doctrine_Db_Statement $stmt, array $params) {
$this->queryEnd($stmt->getQuerySequence());
}
/**
......@@ -100,7 +100,7 @@ class Doctrine_DB_Profiler extends Doctrine_DB_EventListener {
public function queryStart($queryText, $querySequence = -1) {
$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().
......
lib/Doctrine/DB/Profiler/Query.php
View file @ 60985b56
......@@ -20,13 +20,13 @@
*/
/**
* Doctrine_DB_Profiler_Query
* Doctrine_Db_Profiler_Query
*
* @author Konsta Vesterinen
* @license LGPL
* @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.
*/
......
lib/Doctrine/DB/Sqlite.php
View file @ 60985b56
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>.
*/
Doctrine::autoload('Doctrine_DB');
Doctrine::autoload('Doctrine_Db');
/**
* @package Doctrine
* @url http://www.phpdoctrine.com
......@@ -27,6 +27,6 @@ Doctrine::autoload('Doctrine_DB');
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
* @version $Id$
*/
class Doctrine_DB_Sqlite extends Doctrine_DB {
class Doctrine_Db_Sqlite extends Doctrine_Db {
}
lib/Doctrine/DB/Statement.php
View file @ 60985b56
......@@ -19,13 +19,13 @@
* <http://www.phpdoctrine.com>.
*/
/**
* Doctrine_DB_Statement
* Doctrine_Db_Statement
*
* @author Konsta Vesterinen
* @license LGPL
* @package Doctrine
*/
class Doctrine_DB_Statement extends PDOStatement {
class Doctrine_Db_Statement extends PDOStatement {
protected $dbh;
protected $querySequence;
......
lib/Doctrine/DB.php → lib/Doctrine/Db.php
View file @ 60985b56
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>.
*/
class Doctrine_DB extends PDO implements Countable, IteratorAggregate {
class Doctrine_Db extends PDO implements Countable, IteratorAggregate {
/**
* default DSN
*/
......@@ -41,7 +41,7 @@ class Doctrine_DB extends PDO implements Countable, IteratorAggregate {
public function __construct($dsn,$username,$password) {
parent::__construct($dsn,$username,$password);
$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;
if( ! isset($instance)) {
$instance = new Doctrine_DB($dsn,$username,$password);
$instance = new Doctrine_Db($dsn,$username,$password);
}
return $instance;
}
......@@ -74,7 +74,7 @@ class Doctrine_DB extends PDO implements Countable, IteratorAggregate {
$e[1] = $a["user"];
$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];
}
......
lib/Doctrine/Export.php
View file @ 60985b56
......@@ -32,7 +32,7 @@ class Doctrine_Export {
*/
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;
......
lib/Doctrine/Lib.php
View file @ 60985b56
......@@ -100,7 +100,7 @@ class Doctrine_Lib {
$r[] = "Table in memory : ".$connection->count();
$queries = false;
if($connection->getDBH() instanceof Doctrine_DB) {
if($connection->getDBH() instanceof Doctrine_Db) {
$handler = "Doctrine Database Handler";
$queries = count($connection->getDBH()->getQueries());
$sum = array_sum($connection->getDBH()->getExecTimes());
......
lib/Doctrine/Manager.php
View file @ 60985b56
......@@ -198,7 +198,7 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
public function getConnection($name) {
if (!isset($this->connections[$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);
} else {
throw new Doctrine_Manager_Exception("Unknown connection: $name");
......
lib/Doctrine/Record.php
View file @ 60985b56
......@@ -1329,8 +1329,8 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
/**
* addListener
*
* @param Doctrine_DB_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_DB
* @param Doctrine_Db_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_Db
*/
public function 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
*
* @return Doctrine_DB_EventListener_Interface|Doctrine_Overloadable
* @return Doctrine_Db_EventListener_Interface|Doctrine_Overloadable
*/
public function getListener() {
return $this->_table->getListener();
......@@ -1347,8 +1347,8 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
/**
* setListener
*
* @param Doctrine_DB_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_DB
* @param Doctrine_Db_EventListener_Interface|Doctrine_Overloadable $listener
* @return Doctrine_Db
*/
public function setListener($listener) {
$this->_table->setListener($listener);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment