<?php
/***************************************************************************
- * Copyright (C) 2003-2007 Polytechnique.org *
+ * Copyright (C) 2003-2008 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
{
global $globals;
XDB::$mysqli = new mysqli($globals->dbhost, $globals->dbuser, $globals->dbpwd, $globals->dbdb);
- if ($globals->debug & 1) {
+ if ($globals->debug & DEBUG_BT) {
$bt = new PlBacktrace('MySQL');
if (mysqli_connect_errno()) {
$bt->newEvent("MySQLI connection", 0, mysqli_connect_error());
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);
}
return false;
}
- if ($globals->debug & 1) {
+ if ($globals->debug & DEBUG_BT) {
$explain = array();
if (strpos($query, 'FOUND_ROWS()') === false) {
$res = XDB::$mysqli->query("EXPLAIN $query");
}
$res = XDB::$mysqli->query($query);
-
- if ($globals->debug & 1) {
+
+ if ($globals->debug & DEBUG_BT) {
PlBacktrace::$bt['MySQL']->stop(@$res->num_rows ? $res->num_rows : XDB::$mysqli->affected_rows,
XDB::$mysqli->error,
$explain);
public static function execute()
{
- return XDB::_query(XDB::_prepare(func_get_args()));
+ global $globals;
+ $args = func_get_args();
+ if ($globals->mode != 'rw' && !strpos($args[0], 'logger')) {
+ return;
+ }
+ return XDB::_query(XDB::_prepare($args));
}
public static function iterator()
}
public static function error()
- {
+ {
return XDB::$mysqli->error;
}
return XDB::$mysqli->affected_rows;
}
- public static function _db_escape($var)
+ public static function escape($var)
{
switch (gettype($var)) {
case 'boolean':
return 'NULL';
case 'object':
+ if ($var instanceof PlFlagSet) {
+ return "'" . addslashes($var->flags()) . "'";
+ }
case 'array':
return "'".addslashes(serialize($var))."'";
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)) {
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;
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;
}
projects / platal.git / blobdiff