Create DB Connection wrapper and DB\Adapter* classes
This commit is contained in:
parent
62ce3a5613
commit
66a215651b
|
@ -129,6 +129,7 @@ class OC_DB {
|
||||||
'path' => $datadir.'/'.$name.'.db',
|
'path' => $datadir.'/'.$name.'.db',
|
||||||
'driver' => 'pdo_sqlite',
|
'driver' => 'pdo_sqlite',
|
||||||
);
|
);
|
||||||
|
$connectionParams['adapter'] = '\OC\DB\AdapterSqlite';
|
||||||
break;
|
break;
|
||||||
case 'mysql':
|
case 'mysql':
|
||||||
$connectionParams = array(
|
$connectionParams = array(
|
||||||
|
@ -140,6 +141,7 @@ class OC_DB {
|
||||||
'charset' => 'UTF8',
|
'charset' => 'UTF8',
|
||||||
'driver' => 'pdo_mysql',
|
'driver' => 'pdo_mysql',
|
||||||
);
|
);
|
||||||
|
$connectionParams['adapter'] = '\OC\DB\Adapter';
|
||||||
break;
|
break;
|
||||||
case 'pgsql':
|
case 'pgsql':
|
||||||
$connectionParams = array(
|
$connectionParams = array(
|
||||||
|
@ -150,6 +152,7 @@ class OC_DB {
|
||||||
'dbname' => $name,
|
'dbname' => $name,
|
||||||
'driver' => 'pdo_pgsql',
|
'driver' => 'pdo_pgsql',
|
||||||
);
|
);
|
||||||
|
$connectionParams['adapter'] = '\OC\DB\AdapterPgSql';
|
||||||
break;
|
break;
|
||||||
case 'oci':
|
case 'oci':
|
||||||
$connectionParams = array(
|
$connectionParams = array(
|
||||||
|
@ -163,6 +166,7 @@ class OC_DB {
|
||||||
if (!empty($port)) {
|
if (!empty($port)) {
|
||||||
$connectionParams['port'] = $port;
|
$connectionParams['port'] = $port;
|
||||||
}
|
}
|
||||||
|
$connectionParams['adapter'] = '\OC\DB\AdapterOCI8';
|
||||||
break;
|
break;
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
$connectionParams = array(
|
$connectionParams = array(
|
||||||
|
@ -174,10 +178,12 @@ class OC_DB {
|
||||||
'charset' => 'UTF8',
|
'charset' => 'UTF8',
|
||||||
'driver' => 'pdo_sqlsrv',
|
'driver' => 'pdo_sqlsrv',
|
||||||
);
|
);
|
||||||
|
$connectionParams['adapter'] = '\OC\DB\AdapterSQLSrv';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
|
||||||
try {
|
try {
|
||||||
self::$DOCTRINE = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
|
self::$DOCTRINE = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
|
||||||
} catch(\Doctrine\DBAL\DBALException $e) {
|
} catch(\Doctrine\DBAL\DBALException $e) {
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
|
||||||
|
* This file is licensed under the Affero General Public License version 3 or
|
||||||
|
* later.
|
||||||
|
* See the COPYING-README file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OC\DB;
|
||||||
|
|
||||||
|
class Adapter {
|
||||||
|
protected $conn;
|
||||||
|
|
||||||
|
public function __construct($conn) {
|
||||||
|
$this->conn = $conn;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,13 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
|
||||||
|
* This file is licensed under the Affero General Public License version 3 or
|
||||||
|
* later.
|
||||||
|
* See the COPYING-README file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
namespace OC\DB;
|
||||||
|
|
||||||
|
class AdapterOCI8 extends Adapter {
|
||||||
|
}
|
|
@ -0,0 +1,13 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
|
||||||
|
* This file is licensed under the Affero General Public License version 3 or
|
||||||
|
* later.
|
||||||
|
* See the COPYING-README file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
namespace OC\DB;
|
||||||
|
|
||||||
|
class AdapterPgSql extends Adapter {
|
||||||
|
}
|
|
@ -0,0 +1,13 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
|
||||||
|
* This file is licensed under the Affero General Public License version 3 or
|
||||||
|
* later.
|
||||||
|
* See the COPYING-README file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
namespace OC\DB;
|
||||||
|
|
||||||
|
class AdapterSqlite extends Adapter {
|
||||||
|
}
|
|
@ -0,0 +1,13 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
|
||||||
|
* This file is licensed under the Affero General Public License version 3 or
|
||||||
|
* later.
|
||||||
|
* See the COPYING-README file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
namespace OC\DB;
|
||||||
|
|
||||||
|
class AdapterSQLSrv extends Adapter {
|
||||||
|
}
|
|
@ -0,0 +1,88 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
|
||||||
|
* This file is licensed under the Affero General Public License version 3 or
|
||||||
|
* later.
|
||||||
|
* See the COPYING-README file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OC\DB;
|
||||||
|
use Doctrine\DBAL\Driver;
|
||||||
|
use Doctrine\DBAL\Configuration;
|
||||||
|
use Doctrine\DBAL\Cache\QueryCacheProfile;
|
||||||
|
use Doctrine\Common\EventManager;
|
||||||
|
|
||||||
|
class Connection extends \Doctrine\DBAL\Connection {
|
||||||
|
protected $table_prefix;
|
||||||
|
protected $sequence_suffix;
|
||||||
|
|
||||||
|
protected $adapter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes a new instance of the Connection class.
|
||||||
|
*
|
||||||
|
* @param array $params The connection parameters.
|
||||||
|
* @param Driver $driver
|
||||||
|
* @param Configuration $config
|
||||||
|
* @param EventManager $eventManager
|
||||||
|
*/
|
||||||
|
public function __construct(array $params, Driver $driver, Configuration $config = null,
|
||||||
|
EventManager $eventManager = null)
|
||||||
|
{
|
||||||
|
if (!isset($params['adapter'])) {
|
||||||
|
throw new Exception('adapter not set');
|
||||||
|
}
|
||||||
|
parent::__construct($params, $driver, $config, $eventManager);
|
||||||
|
$this->adapter = new $params['adapter']($this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Prepares an SQL statement.
|
||||||
|
*
|
||||||
|
* @param string $statement The SQL statement to prepare.
|
||||||
|
* @return \Doctrine\DBAL\Driver\Statement The prepared statement.
|
||||||
|
*/
|
||||||
|
public function prepare( $statement, $limit=null, $offset=null ) {
|
||||||
|
// TODO: prefix
|
||||||
|
// TODO: limit & offset
|
||||||
|
// TODO: prepared statement cache
|
||||||
|
return parent::prepare($statement);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Executes an, optionally parameterized, SQL query.
|
||||||
|
*
|
||||||
|
* If the query is parameterized, a prepared statement is used.
|
||||||
|
* If an SQLLogger is configured, the execution is logged.
|
||||||
|
*
|
||||||
|
* @param string $query The SQL query to execute.
|
||||||
|
* @param array $params The parameters to bind to the query, if any.
|
||||||
|
* @param array $types The types the previous parameters are in.
|
||||||
|
* @param QueryCacheProfile $qcp
|
||||||
|
* @return \Doctrine\DBAL\Driver\Statement The executed statement.
|
||||||
|
* @internal PERF: Directly prepares a driver statement, not a wrapper.
|
||||||
|
*/
|
||||||
|
public function executeQuery($query, array $params = array(), $types = array(), QueryCacheProfile $qcp = null)
|
||||||
|
{
|
||||||
|
// TODO: prefix
|
||||||
|
return parent::executeQuery($query, $params, $types, $qcp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
|
||||||
|
* and returns the number of affected rows.
|
||||||
|
*
|
||||||
|
* This method supports PDO binding types as well as DBAL mapping types.
|
||||||
|
*
|
||||||
|
* @param string $query The SQL query.
|
||||||
|
* @param array $params The query parameters.
|
||||||
|
* @param array $types The parameter types.
|
||||||
|
* @return integer The number of affected rows.
|
||||||
|
* @internal PERF: Directly prepares a driver statement, not a wrapper.
|
||||||
|
*/
|
||||||
|
public function executeUpdate($query, array $params = array(), array $types = array())
|
||||||
|
{
|
||||||
|
// TODO: prefix
|
||||||
|
return parent::executeUpdate($query, $params, $types);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue