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

* support for default values (mysql.default_user etc...)

Browse Source
This commit is contained in:
David Grudl
2007-02-14 18:27:06 +00:00
parent 4b2e04220b
commit 4d2c90ba68
6 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dibi.compact/dibi.compact.php
View File

@@ -13,11 +13,11 @@
* @license GNU GENERAL PUBLIC LICENSE v2 * @license GNU GENERAL PUBLIC LICENSE v2
* @package dibi * @package dibi
* @category Database * @category Database
* @version 0.7c $Revision: 28 $ $Date: 2007-02-02 04:51:43 +0100 (pá, 02 II 2007) $ * @version 0.7d $Revision: 28 $ $Date: 2007-02-02 04:51:43 +0100 (pá, 02 II 2007) $
*/ */
define('DIBI','Version 0.7c $Revision: 28 $');if(version_compare(PHP_VERSION,'5.0.3','<'))die('dibi needs PHP 5.0.3 or newer');abstract define('DIBI','Version 0.7d $Revision: 28 $');if(version_compare(PHP_VERSION,'5.0.3','<'))die('dibi needs PHP 5.0.3 or newer');abstract
class class
DibiDriver{protected$config;public$formats=array('TRUE'=>"1",'FALSE'=>"0",'date'=>"'Y-m-d'",'datetime'=>"'Y-m-d H:i:s'",);static DibiDriver{protected$config;public$formats=array('TRUE'=>"1",'FALSE'=>"0",'date'=>"'Y-m-d'",'datetime'=>"'Y-m-d H:i:s'",);static
public public
@@ -291,7 +291,7 @@ static
function function
connect($config){if(!extension_loaded('mysql'))throw connect($config){if(!extension_loaded('mysql'))throw
new new
DibiException("PHP extension 'mysql' is not loaded");foreach(array('username','password','protocol')as$var)if(!isset($config[$var]))$config[$var]=NULL;if(empty($config['host']))$config['host']='localhost';if($config['protocol']==='unix')$host=':'.$config['host'];else$host=$config['host'].(empty($config['port'])?'':':'.$config['port']);if(function_exists('ini_set'))$save=ini_set('track_errors',TRUE);$php_errormsg='';if(empty($config['persistent']))$conn=@mysql_connect($host,$config['username'],$config['password']);else$conn=@mysql_pconnect($host,$config['username'],$config['password']);if(function_exists('ini_set'))ini_set('track_errors',$save);if(!is_resource($conn))throw DibiException("PHP extension 'mysql' is not loaded");if(empty($config['username']))$config['username']=ini_get('mysql.default_user');if(empty($config['password']))$config['password']=ini_get('mysql.default_password');if(empty($config['host'])){$config['host']=ini_get('mysql.default_host');if(empty($config['port']))ini_get('mysql.default_port');if(empty($config['host']))$config['host']='localhost';}if(isset($config['protocol'])&&$config['protocol']==='unix')$host=':'.$config['host'];else$host=$config['host'].(empty($config['port'])?'':':'.$config['port']);if(function_exists('ini_set'))$save=ini_set('track_errors',TRUE);$php_errormsg='';if(empty($config['persistent']))$conn=@mysql_connect($host,$config['username'],$config['password']);else$conn=@mysql_pconnect($host,$config['username'],$config['password']);if(function_exists('ini_set'))ini_set('track_errors',$save);if(!is_resource($conn))throw
new new
DibiException("Connecting error",array('message'=>mysql_error()?mysql_error():$php_errormsg,'code'=>mysql_errno(),));if(!empty($config['charset'])){$succ=@mysql_query("SET NAMES '".$config['charset']."'",$conn);}if(!empty($config['database'])){if(!@mysql_select_db($config['database'],$conn))throw DibiException("Connecting error",array('message'=>mysql_error()?mysql_error():$php_errormsg,'code'=>mysql_errno(),));if(!empty($config['charset'])){$succ=@mysql_query("SET NAMES '".$config['charset']."'",$conn);}if(!empty($config['database'])){if(!@mysql_select_db($config['database'],$conn))throw
new new
@@ -360,7 +360,7 @@ static
function function
connect($config){if(!extension_loaded('mysqli'))throw connect($config){if(!extension_loaded('mysqli'))throw
new new
DibiException("PHP extension 'mysqli' is not loaded");if(empty($config['host']))$config['host']='localhost';foreach(array('username','password','database','port')as$var)if(!isset($config[$var]))$config[$var]=NULL;$conn=@mysqli_connect($config['host'],$config['username'],$config['password'],$config['database'],$config['port']);if(!$conn)throw DibiException("PHP extension 'mysqli' is not loaded");if(empty($config['username']))$config['username']=ini_get('mysqli.default_user');if(empty($config['password']))$config['password']=ini_get('mysqli.default_password');if(empty($config['host'])){$config['host']=ini_get('mysqli.default_host');if(empty($config['port']))ini_get('mysqli.default_port');if(empty($config['host']))$config['host']='localhost';}if(!isset($config['database']))$config['database']=NULL;$conn=@mysqli_connect($config['host'],$config['username'],$config['password'],$config['database'],$config['port']);if(!$conn)throw
new new
DibiException("Connecting error",array('message'=>mysqli_connect_error(),'code'=>mysqli_connect_errno(),));if(!empty($config['charset']))mysqli_query($conn,"SET NAMES '".$config['charset']."'");$obj=new DibiException("Connecting error",array('message'=>mysqli_connect_error(),'code'=>mysqli_connect_errno(),));if(!empty($config['charset']))mysqli_query($conn,"SET NAMES '".$config['charset']."'");$obj=new
self($config);$obj->conn=$conn;return$obj;}public self($config);$obj->conn=$conn;return$obj;}public
@@ -425,11 +425,13 @@ static
function function
connect($config){if(!extension_loaded('odbc'))throw connect($config){if(!extension_loaded('odbc'))throw
new new
DibiException("PHP extension 'odbc' is not loaded");if(!isset($config['username']))throw DibiException("PHP extension 'odbc' is not loaded");if(empty($config['username']))$config['username']=ini_get('odbc.default_user');if(empty($config['password']))$config['password']=ini_get('odbc.default_pw');if(empty($config['database']))$config['database']=ini_get('odbc.default_db');if(empty($config['username']))throw
new new
DibiException("Username must be specified");if(!isset($config['password']))throw DibiException("Username must be specified");if(empty($config['password']))throw
new new
DibiException("Password must be specified");if(empty($config['persistent']))$conn=@odbc_connect($config['database'],$config['username'],$config['password']);else$conn=@odbc_pconnect($config['database'],$config['username'],$config['password']);if(!is_resource($conn))throw DibiException("Password must be specified");if(empty($config['database']))throw
new
DibiException("Database must be specified");if(empty($config['persistent']))$conn=@odbc_connect($config['database'],$config['username'],$config['password']);else$conn=@odbc_pconnect($config['database'],$config['username'],$config['password']);if(!is_resource($conn))throw
new new
DibiException("Connecting error",array('message'=>odbc_errormsg(),'code'=>odbc_error(),));$obj=new DibiException("Connecting error",array('message'=>odbc_errormsg(),'code'=>odbc_error(),));$obj=new
self($config);$obj->conn=$conn;return$obj;}public self($config);$obj->conn=$conn;return$obj;}public

4
dibi/dibi.php
View File

@@ -14,11 +14,11 @@
* @license GNU GENERAL PUBLIC LICENSE v2 * @license GNU GENERAL PUBLIC LICENSE v2
* @package dibi * @package dibi
* @category Database * @category Database
* @version 0.7c $Revision$ $Date$ * @version 0.7d $Revision$ $Date$
*/ */
define('DIBI', 'Version 0.7c $Revision$'); define('DIBI', 'Version 0.7d $Revision$');
if (version_compare(PHP_VERSION , '5.0.3', '<')) if (version_compare(PHP_VERSION , '5.0.3', '<'))

14
dibi/drivers/mysql.php
View File

@@ -48,12 +48,16 @@ class DibiMySqlDriver extends DibiDriver {
if (!extension_loaded('mysql')) if (!extension_loaded('mysql'))
throw new DibiException("PHP extension 'mysql' is not loaded"); throw new DibiException("PHP extension 'mysql' is not loaded");
foreach (array('username', 'password', 'protocol') as $var) // default values
if (!isset($config[$var])) $config[$var] = NULL; if (empty($config['username'])) $config['username'] = ini_get('mysql.default_user');
if (empty($config['password'])) $config['password'] = ini_get('mysql.default_password');
if (empty($config['host'])) {
$config['host'] = ini_get('mysql.default_host');
if (empty($config['port'])) ini_get('mysql.default_port');
if (empty($config['host'])) $config['host'] = 'localhost';
}
if (empty($config['host'])) $config['host'] = 'localhost'; if (isset($config['protocol']) && $config['protocol'] === 'unix') // host can be socket
if ($config['protocol'] === 'unix') // host can be socket
$host = ':' . $config['host']; $host = ':' . $config['host'];
else else
$host = $config['host'] . (empty($config['port']) ? '' : ':'.$config['port']); $host = $config['host'] . (empty($config['port']) ? '' : ':'.$config['port']);

13
dibi/drivers/mysqli.php
View File

@@ -45,10 +45,15 @@ class DibiMySqliDriver extends DibiDriver {
if (!extension_loaded('mysqli')) if (!extension_loaded('mysqli'))
throw new DibiException("PHP extension 'mysqli' is not loaded"); throw new DibiException("PHP extension 'mysqli' is not loaded");
if (empty($config['host'])) $config['host'] = 'localhost'; // default values
if (empty($config['username'])) $config['username'] = ini_get('mysqli.default_user');
foreach (array('username', 'password', 'database', 'port') as $var) if (empty($config['password'])) $config['password'] = ini_get('mysqli.default_password');
if (!isset($config[$var])) $config[$var] = NULL; if (empty($config['host'])) {
$config['host'] = ini_get('mysqli.default_host');
if (empty($config['port'])) ini_get('mysqli.default_port');
if (empty($config['host'])) $config['host'] = 'localhost';
}
if (!isset($config['database'])) $config['database'] = NULL;
$conn = @mysqli_connect($config['host'], $config['username'], $config['password'], $config['database'], $config['port']); $conn = @mysqli_connect($config['host'], $config['username'], $config['password'], $config['database'], $config['port']);

12
dibi/drivers/odbc.php
View File

@@ -44,12 +44,20 @@ class DibiOdbcDriver extends DibiDriver {
if (!extension_loaded('odbc')) if (!extension_loaded('odbc'))
throw new DibiException("PHP extension 'odbc' is not loaded"); throw new DibiException("PHP extension 'odbc' is not loaded");
if (!isset($config['username'])) // default values
if (empty($config['username'])) $config['username'] = ini_get('odbc.default_user');
if (empty($config['password'])) $config['password'] = ini_get('odbc.default_pw');
if (empty($config['database'])) $config['database'] = ini_get('odbc.default_db');
if (empty($config['username']))
throw new DibiException("Username must be specified"); throw new DibiException("Username must be specified");
if (!isset($config['password'])) if (empty($config['password']))
throw new DibiException("Password must be specified"); throw new DibiException("Password must be specified");
if (empty($config['database']))
throw new DibiException("Database must be specified");
if (empty($config['persistent'])) if (empty($config['persistent']))
$conn = @odbc_connect($config['database'], $config['username'], $config['password']); $conn = @odbc_connect($config['database'], $config['username'], $config['password']);
else else

2
version.txt
View File

@@ -1 +1 @@
Dibi Version 0.7c Dibi Version 0.7d