nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5269 from annando/non-unique-values

Browse source 
This fixes the problem with mixed variables in queries
This commit is contained in:
Hypolite Petovan 2018-06-21 22:12:07 -04:00 committed by GitHub
parent 438dea8cc5 e1e28ba7c3
commit 47ab72352e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
include/dba.php
View file

@ -76,6 +76,9 @@ class dba {
} }
try { try {
self::$db = @new PDO($connect, $user, $pass); self::$db = @new PDO($connect, $user, $pass);
// Needs more testing
//self::$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
//self::$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
self::$connected = true; self::$connected = true;
} catch (PDOException $e) { } catch (PDOException $e) {
} }
@ -171,7 +174,7 @@ class dba {
*/ */
public static function database_name() { public static function database_name() {
$ret = self::p("SELECT DATABASE() AS `db`"); $ret = self::p("SELECT DATABASE() AS `db`");
$data = self::inArray($ret); $data = self::inArray($ret);
return $data[0]['db']; return $data[0]['db'];
} }
@ -1296,6 +1299,39 @@ class dba {
$condition_string .= " AND "; $condition_string .= " AND ";
} }
if (is_array($value)) { if (is_array($value)) {
// Check if there are integer values in the parameters
$is_int = false;
$is_float = false;
$is_alpha = false;
foreach ($value as $single_value) {
if (is_int($single_value)) {
$is_int = true;
}
// To prevent to round floats we look for them
if (round($single_value) != (float)$single_value) {
$is_float = true;
}
// Is any non numeric value present?
if (!is_numeric($single_value)) {
$is_alpha = true;
}
}
// Cast them all in an unique method
if ($is_int) {
$casted = [];
foreach ($value as $single_value) {
if (!$is_alpha && !$is_float) {
$casted[] = (int)$single_value;
} else {
$casted[] = (string)$single_value;
}
}
$value = $casted;
}
$new_values = array_merge($new_values, array_values($value)); $new_values = array_merge($new_values, array_values($value));
$placeholders = substr(str_repeat("?, ", count($value)), 0, -2); $placeholders = substr(str_repeat("?, ", count($value)), 0, -2);
$condition_string .= "`" . $field . "` IN (" . $placeholders . ")"; $condition_string .= "`" . $field . "` IN (" . $placeholders . ")";