mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-08 07:06:52 +02:00
Code Issues Releases Wiki Activity

DibiConnection::alias() refactoring

Browse Source
This commit is contained in:
David Grudl
2010-05-19 15:29:38 +02:00
parent 27d58bff40
commit 550c477797
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dibi/drivers/mysql.php
View File

@@ -68,7 +68,7 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver
*/ */
public function connect(array &$config) public function connect(array &$config)
{ {
DibiConnection::alias($config, 'options'); $foo = & $config['options'];
if (isset($config['resource'])) { if (isset($config['resource'])) {
$this->connection = $config['resource']; $this->connection = $config['resource'];

4
dibi/drivers/mysqli.php
View File

@@ -68,8 +68,8 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver
*/ */
public function connect(array &$config) public function connect(array &$config)
{ {
DibiConnection::alias($config, 'options'); $foo = & $config['options'];
DibiConnection::alias($config, 'database'); $foo = & $config['database'];
if (isset($config['resource'])) { if (isset($config['resource'])) {
$this->connection = $config['resource']; $this->connection = $config['resource'];

2
dibi/drivers/oracle.php
View File

@@ -62,7 +62,7 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver
*/ */
public function connect(array &$config) public function connect(array &$config)
{ {
DibiConnection::alias($config, 'charset'); $foo = & $config['charset'];
$this->fmtDate = isset($config['formatDate']) ? $config['formatDate'] : 'U'; $this->fmtDate = isset($config['formatDate']) ? $config['formatDate'] : 'U';
$this->fmtDateTime = isset($config['formatDateTime']) ? $config['formatDateTime'] : 'U'; $this->fmtDateTime = isset($config['formatDateTime']) ? $config['formatDateTime'] : 'U';

4
dibi/drivers/pdo.php
View File

@@ -57,9 +57,9 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver
*/ */
public function connect(array &$config) public function connect(array &$config)
{ {
DibiConnection::alias($config, 'dsn'); $foo = & $config['dsn'];
$foo = & $config['options'];
DibiConnection::alias($config, 'resource', 'pdo'); DibiConnection::alias($config, 'resource', 'pdo');
DibiConnection::alias($config, 'options');
if ($config['resource'] instanceof PDO) { if ($config['resource'] instanceof PDO) {
$this->connection = $config['resource']; $this->connection = $config['resource'];

11
dibi/libs/DibiConnection.php
View File

@@ -193,15 +193,14 @@ class DibiConnection extends DibiObject
* @param string alias key * @param string alias key
* @return void * @return void
*/ */
public static function alias(&$config, $key, $alias=NULL) public static function alias(&$config, $key, $alias)
{ {
if (isset($config[$key])) return; $foo = & $config;
foreach (explode('|', $key) as $key) $foo = & $foo[$key];
if ($alias !== NULL && isset($config[$alias])) { if (!isset($foo) && isset($config[$alias])) {
$config[$key] = $config[$alias]; $foo = $config[$alias];
unset($config[$alias]); unset($config[$alias]);
} else {
$config[$key] = NULL;
} }
} }