mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-09-01 18:12:51 +02:00
Code Issues Releases Wiki Activity

* DibiDriver::query -> DibiDriver::nativeQuery

Browse Source 
* Dibi::query moved to DibiDriver::query
* methods getFields(), detectTypes(), getMetaData() moved to base class DibiDriver
* added PDO driver (not tested)
This commit is contained in:
David Grudl
2007-03-27 23:12:36 +00:00
parent f64a5d5251
commit 48ea525b04
12 changed files with 578 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
dibi/dibi.php
View File

@@ -14,11 +14,11 @@
* @license GNU GENERAL PUBLIC LICENSE v2
* @package dibi
* @category Database
* @version 0.7e $Revision$ $Date$
* @version 0.7f $Revision$ $Date$
*/
define('DIBI', 'Version 0.7e $Revision$');
define('DIBI', 'Version 0.7f $Revision$');
if (version_compare(PHP_VERSION , '5.0.3', '<'))
@@ -219,9 +219,6 @@ class dibi
/**
* Generates and executes SQL query
*
@@ -231,77 +228,12 @@ class dibi
*/
static public function query($args)
{
$conn = self::getConnection();
// receive arguments
if (!is_array($args))
$args = func_get_args();
// and generate SQL
$trans = new DibiTranslator($conn, self::$substs);
if (!$trans->translate($args)) {
if (self::$logFile) // log to file
self::log(
"ERROR: SQL generate error"
. "\n-- SQL: " . $trans->sql
. ";\n-- " . date('Y-m-d H:i:s ')
);
if (dibi::$throwExceptions)
throw new DibiException('SQL generate error', NULL, $trans->sql);
else {
trigger_error("dibi: SQL generate error: $trans->sql", E_USER_WARNING);
return FALSE;
}
}
self::$sql = $trans->sql;
// execute SQL
$timer = -microtime(true);
$res = $conn->query(self::$sql);
if ($res === FALSE) { // query error
if (self::$logFile) { // log to file
$info = $conn->errorInfo();
if ($info['code']) $info['message'] = "[$info[code]] $info[message]";
self::log(
"ERROR: $info[message]"
. "\n-- SQL: " . self::$sql
. ";\n-- " . date('Y-m-d H:i:s ')
);
}
if (dibi::$throwExceptions) {
$info = $conn->errorInfo();
throw new DibiException('Query error', $info, self::$sql);
} else {
$info = $conn->errorInfo();
if ($info['code']) $info['message'] = "[$info[code]] $info[message]";
trigger_error("dibi: $info[message]", E_USER_WARNING);
return FALSE;
}
}
if (self::$logFile && self::$logAll) { // log success
$timer += microtime(true);
$msg = $res instanceof DibiResult ? 'object('.get_class($res).') rows: '.$res->rowCount() : 'OK';
self::log(
"OK: " . self::$sql
. ";\n-- result: $msg"
. "\n-- takes: " . sprintf('%0.3f', $timer * 1000) . ' ms'
. "\n-- " . date('Y-m-d H:i:s ')
);
}
return $res;
$args = func_get_args();
return self::getConnection()->query($args);
}
/**
* Generates and prints SQL query
*
@@ -315,13 +247,18 @@ class dibi
$args = func_get_args();
// and generate SQL
$trans = new DibiTranslator(self::getConnection(), self::$substs);
$ok = $trans->translate($args);
if (!$ok) echo 'ERROR: ';
$trans = new DibiTranslator(self::getConnection());
try {
$sql = $trans->translate($args);
} catch (DibiException $e) {
return FALSE;
}
self::dump($trans->sql);
if ($sql === FALSE) return FALSE;
return $ok;
self::dump($sql);
return TRUE;
}
@@ -366,6 +303,7 @@ class dibi
}
/**
* Prints out a syntax highlighted version of the SQL command
*
@@ -449,6 +387,18 @@ class dibi
}
/**
* Process substitutions in string
* @param string
* @return string
*/
static public function substitute($s)
{
if (strpos($s, ':') === FALSE) return $s;
return strtr($s, self::$substs);
}
/**
* Error logging
* EXPERIMENTAL