1
0
mirror of https://github.com/dg/dibi.git synced 2025-08-06 22:26:43 +02:00

- all drivers accepts injected connection resource

- DibiFluent: fixed identifier substitution
This commit is contained in:
David Grudl
2009-01-17 19:27:40 +00:00
parent 47d1180aee
commit 5ecfaf7ab1
10 changed files with 108 additions and 71 deletions

View File

@@ -31,6 +31,7 @@
* - 'formatDateTime' - how to format datetime in SQL (@see date)
* - 'dbcharset' - database character encoding (will be converted to 'charset')
* - 'charset' - character encoding to set (default is UTF-8)
* - 'resource' - connection resource (optional)
*
* @author David Grudl
* @copyright Copyright (c) 2005, 2009 David Grudl
@@ -79,7 +80,9 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver
$this->fmtDateTime = isset($config['formatDateTime']) ? $config['formatDateTime'] : 'U';
$errorMsg = '';
if (empty($config['persistent'])) {
if (isset($config['resource'])) {
$this->connection = $config['resource'];
} elseif (empty($config['persistent'])) {
$this->connection = @sqlite_open($config['database'], 0666, $errorMsg); // intentionally @
} else {
$this->connection = @sqlite_popen($config['database'], 0666, $errorMsg); // intentionally @