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

- consolidating the aliases for the connection parameters

Browse Source
This commit is contained in:
David Grudl
2009-07-13 20:13:48 +00:00
parent fb026ef45d
commit 18a7665bec
8 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dibi/drivers/mssql.php
View File

@@ -64,10 +64,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver
*/ */
public function connect(array &$config) public function connect(array &$config)
{ {
DibiConnection::alias($config, 'username', 'user');
DibiConnection::alias($config, 'password', 'pass');
DibiConnection::alias($config, 'host', 'hostname');
if (isset($config['resource'])) { if (isset($config['resource'])) {
$this->connection = $config['resource']; $this->connection = $config['resource'];
} elseif (empty($config['persistent'])) { } elseif (empty($config['persistent'])) {

2
dibi/drivers/mssql2005.php
View File

@@ -65,8 +65,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver
*/ */
public function connect(array &$config) public function connect(array &$config)
{ {
DibiConnection::alias($config, 'host', 'hostname');
if (isset($config['resource'])) { if (isset($config['resource'])) {
$this->connection = $config['resource']; $this->connection = $config['resource'];
} elseif (isset($config['options'])) { } elseif (isset($config['options'])) {

3
dibi/drivers/mysql.php
View File

@@ -77,9 +77,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver
*/ */
public function connect(array &$config) public function connect(array &$config)
{ {
DibiConnection::alias($config, 'username', 'user');
DibiConnection::alias($config, 'password', 'pass');
DibiConnection::alias($config, 'host', 'hostname');
DibiConnection::alias($config, 'options'); DibiConnection::alias($config, 'options');
if (isset($config['resource'])) { if (isset($config['resource'])) {

3
dibi/drivers/mysqli.php
View File

@@ -77,9 +77,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver
*/ */
public function connect(array &$config) public function connect(array &$config)
{ {
DibiConnection::alias($config, 'username', 'user');
DibiConnection::alias($config, 'password', 'pass');
DibiConnection::alias($config, 'host', 'hostname');
DibiConnection::alias($config, 'options'); DibiConnection::alias($config, 'options');
DibiConnection::alias($config, 'database'); DibiConnection::alias($config, 'database');

3
dibi/drivers/odbc.php
View File

@@ -66,9 +66,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver
*/ */
public function connect(array &$config) public function connect(array &$config)
{ {
DibiConnection::alias($config, 'username', 'user');
DibiConnection::alias($config, 'password', 'pass');
if (isset($config['resource'])) { if (isset($config['resource'])) {
$this->connection = $config['resource']; $this->connection = $config['resource'];
} else { } else {

3
dibi/drivers/oracle.php
View File

@@ -66,9 +66,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver
*/ */
public function connect(array &$config) public function connect(array &$config)
{ {
DibiConnection::alias($config, 'username', 'user');
DibiConnection::alias($config, 'password', 'pass');
DibiConnection::alias($config, 'database', 'db');
DibiConnection::alias($config, 'charset'); DibiConnection::alias($config, 'charset');
if (isset($config['resource'])) { if (isset($config['resource'])) {

2
dibi/drivers/pdo.php
View File

@@ -66,8 +66,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver
*/ */
public function connect(array &$config) public function connect(array &$config)
{ {
DibiConnection::alias($config, 'username', 'user');
DibiConnection::alias($config, 'password', 'pass');
DibiConnection::alias($config, 'dsn'); DibiConnection::alias($config, 'dsn');
DibiConnection::alias($config, 'resource', 'pdo'); DibiConnection::alias($config, 'resource', 'pdo');
DibiConnection::alias($config, 'options'); DibiConnection::alias($config, 'options');

4
dibi/libs/DibiConnection.php
View File

@@ -69,6 +69,10 @@ class DibiConnection extends DibiObject
throw new InvalidArgumentException('Configuration must be array, string or ArrayObject.'); throw new InvalidArgumentException('Configuration must be array, string or ArrayObject.');
} }
self::alias($config, 'username', 'user');
self::alias($config, 'password', 'pass');
self::alias($config, 'host', 'hostname');
if (!isset($config['driver'])) { if (!isset($config['driver'])) {
$config['driver'] = dibi::$defaultDriver; $config['driver'] = dibi::$defaultDriver;
} }