Skip to content

Bugfixes an features #218

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
Apr 21, 2015
Merged

Bugfixes an features #218

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af809c5
Fix #210 empty getLastQuery after rawQuery() execution
avbdr Apr 20, 2015
f68a33d
Fix #210 empty getLastQuery after rawQuery() execution
avbdr Apr 20, 2015
c00c501
Merge branch 'master' of https://github.com/avbdr/PHP-MySQLi-Database…
avbdr Apr 21, 2015
8a2127c
Silence warning on stored procedure call
avbdr Apr 21, 2015
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
6 changes: 5 additions & 1 deletion MysqliDb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,14 @@ public function setPrefix($prefix = '')
*/
public function rawQuery ($query, $bindParams = null, $sanitize = true)
{
$params = array(''); // Create the empty 0 index
$this->_query = $query;
if ($sanitize)
$this->_query = filter_var ($query, FILTER_SANITIZE_STRING,
FILTER_FLAG_NO_ENCODE_QUOTES);
$stmt = $this->_prepareQuery();

if (is_array($bindParams) === true) {
$params = array(''); // Create the empty 0 index
foreach ($bindParams as $prop => $val) {
$params[0] .= $this->_determineType($val);
array_push($params, $bindParams[$prop]);
Expand All @@ -237,6 +237,7 @@ public function rawQuery ($query, $bindParams = null, $sanitize = true)

$stmt->execute();
$this->_stmtError = $stmt->error;
$this->_lastQuery = $this->replacePlaceHolders ($this->_query, $params);
$this->reset();

return $this->_dynamicBindResults($stmt);
Expand Down Expand Up @@ -719,6 +720,9 @@ protected function _dynamicBindResults(mysqli_stmt $stmt)
$this->count++;
array_push($results, $x);
}
// stored procedures sometimes can return more then 1 resultset
if ($this->_mysqli->more_results())
$this->_mysqli->next_result();

if ($this->fetchTotalCount === true) {
$this->fetchTotalCount = false;
Expand Down