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

DibiConnection: option 'driver' can contain driver instance or class name [Closes #153]

Browse Source
This commit is contained in:
Pavel Zelezny
2015-10-26 16:11:42 +01:00
committed by David Grudl
parent e339eff00f
commit 9100f94b8f
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dibi/libs/DibiConnection.php
View File

@@ -75,6 +75,12 @@ class DibiConnection extends DibiObject
$config['driver'] = dibi::$defaultDriver; $config['driver'] = dibi::$defaultDriver;
} }
if ($config['driver'] instanceof IDibiDriver) {
$this->driver = $config['driver'];
$config['driver'] = get_class($this->driver);
} elseif (PHP_VERSION_ID >= 50307 && is_subclass_of($config['driver'], 'IDibiDriver')) {
$this->driver = new $config['driver'];
} else {
$class = preg_replace(array('#\W#', '#sql#'), array('_', 'Sql'), ucfirst(strtolower($config['driver']))); $class = preg_replace(array('#\W#', '#sql#'), array('_', 'Sql'), ucfirst(strtolower($config['driver'])));
$class = "Dibi{$class}Driver"; $class = "Dibi{$class}Driver";
if (!class_exists($class)) { if (!class_exists($class)) {
@@ -84,10 +90,11 @@ class DibiConnection extends DibiObject
throw new DibiException("Unable to create instance of dibi driver '$class'."); throw new DibiException("Unable to create instance of dibi driver '$class'.");
} }
} }
$this->driver = new $class;
}
$config['name'] = $name; $config['name'] = $name;
$this->config = $config; $this->config = $config;
$this->driver = new $class;
$this->translator = new DibiTranslator($this); $this->translator = new DibiTranslator($this);
// profiler // profiler