X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxdb.php;h=da211a0dc0355ef714670dc32f91ef0f901a760b;hb=a94040d29c55a02e3935b2ecedab3a07d347a3e0;hp=6d0223fe2b62dcf873edaa900b6b6faaadc1fd4b;hpb=0380bf854bc295fb66fb8e1071d63a3537cdba2c;p=platal.git diff --git a/classes/xdb.php b/classes/xdb.php index 6d0223f..da211a0 100644 --- a/classes/xdb.php +++ b/classes/xdb.php @@ -27,11 +27,12 @@ class XDB { global $globals; XDB::$mysqli = new mysqli($globals->dbhost, $globals->dbuser, $globals->dbpwd, $globals->dbdb); - if (mysqli_connect_errno() && $globals->debug & 1) { - $GLOBALS['XDB::trace_data'][] = array('query' => 'MySQLI connection', 'explain' => array(), - 'error' => mysqli_connect_error(), 'exectime' => 0, 'rows' => 0); - $GLOBALS['XDB::error'] = true; - return false; + if ($globals->debug & 1) { + $bt = new PlBacktrace('MySQL'); + if (mysqli_connect_errno()) { + $bt->newEvent("MySQLI connection", 0, mysqli_connect_error()); + return false; + } } XDB::$mysqli->autocommit(true); XDB::$mysqli->set_charset($globals->dbcharset); @@ -40,7 +41,7 @@ class XDB public static function _prepare($args) { - $query = array_map(Array('XDB', '_db_escape'), $args); + $query = array_map(Array('XDB', 'escape'), $args); $query[0] = str_replace('{?}', '%s', str_replace('%', '%%', $args[0])); return call_user_func_array('sprintf', $query); } @@ -89,24 +90,15 @@ class XDB $res->free(); } } - $trace_data = array('query' => XDB::_reformatQuery($query), 'explain' => $explain); - $time_start = microtime(); + PlBacktrace::$bt['MySQL']->start(XDB::_reformatQuery($query)); } $res = XDB::$mysqli->query($query); - + if ($globals->debug & 1) { - list($ue, $se) = explode(" ", microtime()); - list($us, $ss) = explode(" ", $time_start); - $time = intval((($ue - $us) + ($se - $ss)) * 1000); - $trace_data['error'] = XDB::$mysqli->error; - $trace_data['errno'] = XDB::$mysqli->errno; - $trace_data['exectime'] = $time; - $trace_data['rows'] = @$res->num_rows ? $res->num_rows : XDB::$mysqli->affected_rows; - $GLOBALS['XDB::trace_data'][] = $trace_data; - if (XDB::$mysqli->errno) { - $GLOBALS['XDB::error'] = true; - } + PlBacktrace::$bt['MySQL']->stop(@$res->num_rows ? $res->num_rows : XDB::$mysqli->affected_rows, + XDB::$mysqli->error, + $explain); } return $res; } @@ -138,27 +130,11 @@ class XDB public static function errno() { - global $globals; - if ($globals->debug & 1) { - $count = count($GLOBALS['XDB::trace_data']); - if (!$count) { - return 0; - } - return $GLOBALS['XDB::trace_data'][$count - 1]['errno']; - } return XDB::$mysqli->errno; } public static function error() { - global $globals; - if ($globals->debug & 1) { - $count = count($GLOBALS['XDB::trace_data']); - if (!$count) { - return null; - } - return $GLOBALS['XDB::trace_data'][$count - 1]['error']; - } return XDB::$mysqli->error; } @@ -167,7 +143,7 @@ class XDB return XDB::$mysqli->affected_rows; } - public static function _db_escape($var) + public static function escape($var) { switch (gettype($var)) { case 'boolean': @@ -192,12 +168,6 @@ class XDB die(var_export($var, true).' is not a valid for a database entry'); } } - - public static function trace_format(&$page, $template = 'skin/common.database-debug.tpl') { - $page->assign('trace_data', @$GLOBALS['XDB::trace_data']); - $page->assign('db_error', @$GLOBALS['XDB::error']); - return $page->fetch($template); - } } class XOrgDBResult @@ -205,67 +175,75 @@ class XOrgDBResult private $_res; - function XOrgDBResult($query) + public function __construct($query) { $this->_res = XDB::_query($query); } - function free() + public function free() { - $this->_res->free(); + if ($this->_res) { + $this->_res->free(); + } unset($this); } - function _fetchRow() + protected function _fetchRow() { - return $this->_res->fetch_row(); + return $this->_res ? $this->_res->fetch_row() : null; } - function _fetchAssoc() + protected function _fetchAssoc() { - return $this->_res->fetch_assoc(); + return $this->_res ? $this->_res->fetch_assoc() : null; } - function fetchAllRow() + public function fetchAllRow() { $result = Array(); + if (!$this->_res) { + return $result; + } while ($result[] = $this->_res->fetch_row()); array_pop($result); $this->free(); return $result; } - function fetchAllAssoc() + public function fetchAllAssoc() { $result = Array(); + if (!$this->_res) { + return $result; + } while ($result[] = $this->_res->fetch_assoc()); array_pop($result); $this->free(); return $result; } - function fetchOneAssoc() + public function fetchOneAssoc() { $tmp = $this->_fetchAssoc(); $this->free(); return $tmp; } - function fetchOneRow() + public function fetchOneRow() { $tmp = $this->_fetchRow(); $this->free(); return $tmp; } - function fetchOneCell() + public function fetchOneCell() { $tmp = $this->_fetchRow(); $this->free(); return $tmp[0]; } - function fetchColumn($key = 0) + public function fetchColumn($key = 0) { $res = Array(); if (is_numeric($key)) { @@ -281,30 +259,32 @@ class XOrgDBResult return $res; } - function fetchOneField() + public function fetchOneField() { - return $this->_res->fetch_field(); + return $this->_res ? $this->_res->fetch_field() : null; } - function fetchFields() + public function fetchFields() { $res = array(); while ($res[] = $this->fetchOneField()); return $res; } - function numRows() + public function numRows() { - return $this->_res->num_rows; + return $this->_res ? $this->_res->num_rows : 0; } - function fieldCount() + public function fieldCount() { - return $this->_res->field_count; + return $this->_res ? $this->_res->field_count : 0; } } -class XOrgDBIterator +require_once dirname(__FILE__) . '/pliterator.php'; + +class XOrgDBIterator extends XOrgDBResult implements PlIterator { private $_result; private $_pos; @@ -313,62 +293,62 @@ class XOrgDBIterator private $_fields; private $_mode = MYSQL_ASSOC; - function __construct($query, $mode = MYSQL_ASSOC) + public function __construct($query, $mode = MYSQL_ASSOC) { - $this->_result = new XOrgDBResult($query); + parent::__construct($query); $this->_pos = 0; - $this->_total = $this->_result->numRows(); + $this->_total = $this->numRows(); $this->_fpost = 0; - $this->_fields = $this->_result->fieldCount(); + $this->_fields = $this->fieldCount(); $this->_mode = $mode; } - function next() + public function next() { $this->_pos ++; if ($this->_pos > $this->_total) { - $this->_result->free(); + $this->free(); unset($this); return null; } - return $this->_mode != MYSQL_ASSOC ? $this->_result->_fetchRow() : $this->_result->_fetchAssoc(); + return $this->_mode != MYSQL_ASSOC ? $this->_fetchRow() : $this->_fetchAssoc(); } - function first() + public function first() { return $this->_pos == 1; } - function last() + public function last() { return $this->_pos == $this->_total; } - function total() + public function total() { return $this->_total; } - function nextField() + public function nextField() { $this->_fpos++; if ($this->_fpos > $this->_fields) { return null; } - return $this->_result->fetchOneField(); + return $this->fetchOneField(); } - function firstField() + public function firstField() { return $this->_fpos == 1; } - function lastField() + public function lastField() { return $this->_fpos == $this->_fields; } - function totalFields() + public function totalFields() { return $this->_fields; }