Skip to content

Added 'null'/'NULL' insertion as 'NULL' instead of an empty string '' #954

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added 'null'/'NULL' insertion as 'NULL' instead of an empty string '' #954

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd16866
Update MysqliDb.php
enrybisco Feb 17, 2021
6ab9dc4
Merge pull request #1 from enrybisco/enrybisco-patch-1-NullInsertion
enrybisco Feb 17, 2021
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
53 changes: 26 additions & 27 deletions MysqliDb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,22 +543,6 @@ private function queryUnprepared($query)
throw new Exception(sprintf('Unprepared Query Failed, ERRNO: %u (%s)', $this->mysqli()->errno, $this->mysqli()->error), $this->mysqli()->errno);
}

/**
* Prefix add raw SQL query.
*
* @author Emre Emir <https://github.com/bejutassle>
* @param string $query User-provided query to execute.
* @return string Contains the returned rows from the query.
*/
public function rawAddPrefix($query){
$query = str_replace(PHP_EOL, null, $query);
$query = preg_replace('/\s+/', ' ', $query);
preg_match_all("/(from|into|update|join) [\\'\\´]?([a-zA-Z0-9_-]+)[\\'\\´]?/i", $query, $matches);
list($from_table, $from, $table) = $matches;

return str_replace($table[0], self::$prefix.$table[0], $query);
}

/**
* Execute raw SQL query.
*
Expand All @@ -570,15 +554,24 @@ public function rawAddPrefix($query){
*/
public function rawQuery($query, $bindParams = null)
{
$query = $this->rawAddPrefix($query);
$params = array(''); // Create the empty 0 index
$this->_query = $query;
$stmt = $this->_prepareQuery();

if (is_array($bindParams) === true) {
foreach ($bindParams as $prop => $val) {
$params[0] .= $this->_determineType($val);
array_push($params, $bindParams[$prop]);
//HENRY MOD 01
if ($val === null || $val == 'null' || $val == 'NULL' || is_null($val) ) {
$val = 'NULL';
}
$params[0] .= $this->_determineType($val);

if ($val === null || $val == 'null' || $val == 'NULL' || is_null($val) ) {
array_push($params, NULL);
}else{
array_push($params, $bindParams[$prop]);
}
//END: HENRY MOD 01
}

call_user_func_array(array($stmt, 'bind_param'), $this->refValues($params));
Expand All @@ -588,7 +581,7 @@ public function rawQuery($query, $bindParams = null)
$this->count = $stmt->affected_rows;
$this->_stmtError = $stmt->error;
$this->_stmtErrno = $stmt->errno;
$this->_lastQuery = $this->replacePlaceHolders($this->_query, $params);
$this->_lastQuery = $this->replacePlaceHolders($this->_query, $params);
$res = $this->_dynamicBindResults($stmt);
$this->reset();

Expand Down Expand Up @@ -674,7 +667,9 @@ public function query($query, $numRows = null)
*
* @uses $MySqliDb->setQueryOption('name');
*
* @param string|array $options The options name of the query.
* @param string|array $options The options name of the query.'ALL', 'DISTINCT', 'DISTINCTROW', 'HIGH_PRIORITY', 'STRAIGHT_JOIN', 'SQL_SMALL_RESULT',
'SQL_BIG_RESULT', 'SQL_BUFFER_RESULT', 'SQL_CACHE', 'SQL_NO_CACHE', 'SQL_CALC_FOUND_ROWS',
'LOW_PRIORITY', 'IGNORE', 'QUICK', 'MYSQLI_NESTJOIN', 'FOR UPDATE', 'LOCK IN SHARE MODE'
*
* @throws Exception
* @return MysqliDb
Expand Down Expand Up @@ -1453,11 +1448,12 @@ public function ping()
protected function _determineType($item)
{
switch (gettype($item)) {
case 'NULL':

case 'string':
return 's';
break;

//HENRY MOD 02
case 'NULL':
case 'boolean':
case 'integer':
return 'i';
Expand Down Expand Up @@ -2057,10 +2053,13 @@ protected function replacePlaceHolders($str, $vals)
if (is_object($val)) {
$val = '[object]';
}
if ($val === null) {
$val = 'NULL';
}
$newStr .= substr($str, 0, $pos) . "'" . $val . "'";
if ($val === null || $val == 'null' || $val == 'NULL' || is_null($val) ) {
$val = "NULL";
$newStr .= substr($str, 0, $pos) . $val ;
}else{
$newStr .= substr($str, 0, $pos) . "'" . $val . "'";
}

$str = substr($str, $pos + 1);
}
$newStr .= $str;
Expand Down