Permalink
Browse files

Rename DatabasePDO* to PDO*

  • Loading branch information...
1 parent acb5294 commit 982371c8efe9218d1bc43e27ce7ede5ab4ae2842 @haraldpdl haraldpdl committed Mar 28, 2011
@@ -10,11 +10,9 @@
namespace osCommerce\OM\Core;
- use \PDO;
-
use osCommerce\OM\Core\OSCOM;
- class DatabasePDO extends PDO {
+ class PDO extends \PDO {
protected $_connected = false;
protected $_server;
protected $_username;
@@ -59,10 +57,10 @@ public static function initialize($server = null, $username = null, $password =
}
if ( !isset($driver_options[PDO::ATTR_STATEMENT_CLASS]) ) {
- $driver_options[PDO::ATTR_STATEMENT_CLASS] = array('osCommerce\\OM\\Core\\DatabasePDOStatement');
+ $driver_options[PDO::ATTR_STATEMENT_CLASS] = array('osCommerce\\OM\\Core\\PDOStatement');
}
- $class = 'osCommerce\\OM\\Core\\DatabasePDO\\' . $driver;
+ $class = 'osCommerce\\OM\\Core\\PDO\\' . $driver;
$object = new $class($server, $username, $password, $database, $port, $driver_options);
$object->_driver = $driver;
@@ -8,9 +8,9 @@
as published by the Free Software Foundation.
*/
- namespace osCommerce\OM\Core\DatabasePDO\Microsoft;
+ namespace osCommerce\OM\Core\PDO\Microsoft;
- class SqlServer extends \osCommerce\OM\Core\DatabasePDO {
+ class SqlServer extends \osCommerce\OM\Core\PDO {
public function __construct($server, $username, $password, $database, $port, $driver_options) {
$this->_server = $server;
$this->_username = $username;
@@ -8,13 +8,13 @@
as published by the Free Software Foundation.
*/
- namespace osCommerce\OM\Core\DatabasePDO\MySQL;
+ namespace osCommerce\OM\Core\PDO\MySQL;
use \PDO;
use osCommerce\OM\Core\OSCOM;
- class Standard extends \osCommerce\OM\Core\DatabasePDO {
+ class Standard extends \osCommerce\OM\Core\PDO {
protected $_has_native_fk = false;
protected $_fkeys = array();
@@ -28,7 +28,7 @@ public function __construct($server, $username, $password, $database, $port, $dr
// Override ATTR_STATEMENT_CLASS to automatically handle foreign key constraints
if ( $this->_has_native_fk === false ) {
- $this->_driver_options[PDO::ATTR_STATEMENT_CLASS] = array('osCommerce\\OM\\Core\\DatabasePDO\\MySQL\\Standard\\PDOStatement', array($this));
+ $this->_driver_options[PDO::ATTR_STATEMENT_CLASS] = array('osCommerce\\OM\\Core\\PDO\\MySQL\\Standard\\PDOStatement', array($this));
}
// Only one init command can be issued (see http://bugs.php.net/bug.php?id=48859)
@@ -8,11 +8,11 @@
as published by the Free Software Foundation.
*/
- namespace osCommerce\OM\Core\DatabasePDO\MySQL\Standard;
+ namespace osCommerce\OM\Core\PDO\MySQL\Standard;
use osCommerce\OM\Core\OSCOM;
- class PDOStatement extends \osCommerce\OM\Core\DatabasePDOStatement {
+ class PDOStatement extends \osCommerce\OM\Core\PDOStatement {
protected $_pdo;
protected function __construct($pdo) {
@@ -8,9 +8,9 @@
as published by the Free Software Foundation.
*/
- namespace osCommerce\OM\Core\DatabasePDO\MySQL;
+ namespace osCommerce\OM\Core\PDO\MySQL;
- class V5 extends \osCommerce\OM\Core\DatabasePDO\MySQL\Standard {
+ class V5 extends \osCommerce\OM\Core\PDO\MySQL\Standard {
protected $_has_native_fk = true;
protected $_driver_parent = 'MySQL\\Standard';
}
@@ -8,9 +8,9 @@
as published by the Free Software Foundation.
*/
- namespace osCommerce\OM\Core\DatabasePDO;
+ namespace osCommerce\OM\Core\PDO;
- class SQLite3 extends \osCommerce\OM\Core\DatabasePDO {
+ class SQLite3 extends \osCommerce\OM\Core\PDO {
public function __construct($server, $username, $password, $database, $port, $driver_options) {
$this->_server = $server;
$this->_username = $username;
@@ -13,7 +13,7 @@
use osCommerce\OM\Core\HTML;
use osCommerce\OM\Core\PDO;
- class DatabasePDOStatement extends \PDOStatement {
+ class PDOStatement extends \PDOStatement {
protected $_is_error = false;
protected $_binded_params = array();

0 comments on commit 982371c

Please sign in to comment.