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

- added config alias 'hostname' for 'host'

Browse Source
This commit is contained in:
David Grudl
2008-07-15 09:34:05 +00:00
parent 69ead6da56
commit 7f0fa2e75e
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dibi/dibi.php
View File

@@ -778,15 +778,19 @@ class dibi
/** /**
* Returns brief descriptions. * Returns brief descriptions.
* @return string
* @return array * @return array
*/ */
public static function getColophon() public static function getColophon($sender = NULL)
{ {
return array( $arr = array(
'dibi version: ' . dibi::VERSION, 'Number of SQL queries: ' . dibi::$numOfQueries
'Number or queries: ' . dibi::$numOfQueries . (dibi::$totalTime === NULL ? '' : ', elapsed time: ' . sprintf('%0.3f', dibi::$totalTime * 1000) . ' ms'),
. (dibi::$totalTime === NULL ? '' : ' (elapsed time: ' . sprintf('%0.3f', dibi::$totalTime * 1000) . ' ms)'),
); );
if ($sender === 'bluescreen') {
$arr[] = 'dibi version ' . dibi::VERSION;
}
return $arr;
} }
} }

2
dibi/drivers/mssql.php
View File

@@ -74,7 +74,7 @@ class DibiMsSqlDriver extends /*Nette::*/Object implements IDibiDriver
{ {
DibiConnection::alias($config, 'username', 'user'); DibiConnection::alias($config, 'username', 'user');
DibiConnection::alias($config, 'password', 'pass'); DibiConnection::alias($config, 'password', 'pass');
DibiConnection::alias($config, 'host'); DibiConnection::alias($config, 'host', 'hostname');
if (empty($config['persistent'])) { if (empty($config['persistent'])) {
$this->connection = @mssql_connect($config['host'], $config['username'], $config['password'], TRUE); // intentionally @ $this->connection = @mssql_connect($config['host'], $config['username'], $config['password'], TRUE); // intentionally @

1
dibi/drivers/mysql.php
View File

@@ -87,6 +87,7 @@ class DibiMySqlDriver extends /*Nette::*/Object implements IDibiDriver
{ {
DibiConnection::alias($config, 'username', 'user'); DibiConnection::alias($config, 'username', 'user');
DibiConnection::alias($config, 'password', 'pass'); DibiConnection::alias($config, 'password', 'pass');
DibiConnection::alias($config, 'host', 'hostname');
DibiConnection::alias($config, 'options'); DibiConnection::alias($config, 'options');
// default values // default values

1
dibi/drivers/mysqli.php
View File

@@ -87,6 +87,7 @@ class DibiMySqliDriver extends /*Nette::*/Object implements IDibiDriver
{ {
DibiConnection::alias($config, 'username', 'user'); DibiConnection::alias($config, 'username', 'user');
DibiConnection::alias($config, 'password', 'pass'); 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');

4
examples/nette-debug.php
View File

@@ -1,11 +1,11 @@
<h1>Nette::Debug && dibi example</h1> <h1>Nette::Debug && dibi example</h1>
<?php <?php
require_once '../dibi/dibi.php';
require_once 'Nette/Debug.php'; require_once 'Nette/Debug.php';
require_once '../dibi/dibi.php';
Debug::enable(); Debug::enable();
Debug::enableProfiler();
dibi::connect(array( dibi::connect(array(