Skip to content

Simple issue fixes #1018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 24, 2024
Merged

Simple issue fixes #1018

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
295c4c6
Trace defaults, fixes #1016 fixes #1013
RivenSkaye Jul 24, 2023
3f6f76f
fixes #1015
RivenSkaye Jul 24, 2023
d181606
Prevent calling end on `stdClass`, fixes #1001
RivenSkaye Jul 24, 2023
057d820
re-add newline before EOF
RivenSkaye Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions MysqliDb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,9 @@ class MysqliDb
/**
* Variables for query execution tracing
*/
protected $traceStartQ;
protected $traceEnabled;
protected $traceStripPrefix;
protected $traceStartQ = 0;
protected $traceEnabled = false;
protected $traceStripPrefix = '';
public $trace = array();

/**
Expand Down Expand Up @@ -790,11 +790,11 @@ public function getOne($tableName, $columns = '*')
/**
* A convenient SELECT COLUMN function to get a single column value from one row
*
* @param string $tableName The name of the database table to work with.
* @param string $column The desired column
* @param int $limit Limit of rows to select. Use null for unlimited..1 by default
* @param string $tableName The name of the database table to work with.
* @param string $column The desired column
* @param int|null $limit Limit of rows to select. Use null for unlimited. 1 by default
*
* @return mixed Contains the value of a returned column / array of values
* @return mixed Contains the value of a returned column / array of values
* @throws Exception
*/
public function getValue($tableName, $column, $limit = 1)
Expand Down Expand Up @@ -1689,7 +1689,12 @@ protected function _dynamicBindResults(mysqli_stmt $stmt)
}
$this->count++;
if ($this->_mapKey) {
$results[$row[$this->_mapKey]] = count($row) > 2 ? $result : end($result);
if (count($row) < 3 && $this->returnType == 'object') {
$res = new ArrayIterator($result);
$res->seek($_res->count() - 1);
$results[$row[$this->_mapKey]] = $res->current();
}
else $results[$row[$this->_mapKey]] = count($row) > 2 ? $result : end($result);
} else {
array_push($results, $result);
}
Expand Down Expand Up @@ -2329,7 +2334,7 @@ public function _transaction_status_check()
*
* @return MysqliDb
*/
public function setTrace($enabled, $stripPrefix = null)
public function setTrace($enabled, $stripPrefix = '')
{
$this->traceEnabled = $enabled;
$this->traceStripPrefix = $stripPrefix;
Expand All @@ -2350,7 +2355,7 @@ private function _traceGetCaller()
}

return __CLASS__ . "->" . $caller["function"] . "() >> file \"" .
str_replace($this->traceStripPrefix, '', $caller["file"]) . "\" line #" . $caller["line"] . " ";
str_replace($this->traceStripPrefix , '', $caller["file"]) . "\" line #" . $caller["line"] . " ";
}

/**
Expand Down