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

compatibility with Nette::Config

Browse Source
This commit is contained in:
David Grudl
2008-04-21 11:32:58 +00:00
parent 11a314ca96
commit 62f8c47410
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dibi/libs/DibiConnection.php
View File

@@ -59,9 +59,10 @@ class DibiConnection extends /*Nette::*/Object
* Creates object and (optionally) connects to a database.
*
* @param array|string|Nette::Collections::IMap connection parameters
* @param string connection name
* @throws DibiException
*/
public function __construct($config)
public function __construct($config, $name = NULL)
{
// DSN string
if (is_string($config)) {
@@ -69,6 +70,9 @@ class DibiConnection extends /*Nette::*/Object
} elseif ($config instanceof /*Nette::Collections::*/IMap) {
$config = $config->toArray();
} elseif (!is_array($config)) {
throw new InvalidArgumentException('Configuration must be array, string or Nette::Collections::IMap.');
}
if (!isset($config['driver'])) {
@@ -85,6 +89,7 @@ class DibiConnection extends /*Nette::*/Object
}
}
$config['name'] = $name;
$this->config = $config;
$this->driver = new $class;