keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8555 from annando/issue-8546

Browse source 
Issue 8546: Added option to not use prepared statements
This commit is contained in:
Hypolite Petovan 2020-04-28 08:52:35 -04:00 committed by GitHub
commit 892c49fa30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Database/Database.php
View file

@ -57,6 +57,7 @@ class Database
/** @var PDO|mysqli */ /** @var PDO|mysqli */
protected $connection; protected $connection;
protected $driver; protected $driver;
private $emulate_prepares = false;
private $error = false; private $error = false;
private $errorno = 0; private $errorno = 0;
private $affected_rows = 0; private $affected_rows = 0;
@ -130,6 +131,8 @@ class Database
return false; return false;
} }
$this->emulate_prepares = (bool)$this->configCache->get('database', 'emulate_prepares');
if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) { if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
$this->driver = 'pdo'; $this->driver = 'pdo';
$connect = "mysql:host=" . $server . ";dbname=" . $db; $connect = "mysql:host=" . $server . ";dbname=" . $db;
@ -428,8 +431,10 @@ class Database
{ {
$offset = 0; $offset = 0;
foreach ($args AS $param => $value) { foreach ($args AS $param => $value) {
if (is_int($args[$param]) || is_float($args[$param])) { if (is_int($args[$param]) || is_float($args[$param]) || is_bool($args[$param])) {
$replace = intval($args[$param]); $replace = intval($args[$param]);
} elseif (is_null($args[$param])) {
$replace = 'NULL';
} else { } else {
$replace = "'" . $this->escape($args[$param]) . "'"; $replace = "'" . $this->escape($args[$param]) . "'";
} }
@ -515,8 +520,8 @@ class Database
switch ($this->driver) { switch ($this->driver) {
case 'pdo': case 'pdo':
// If there are no arguments we use "query" // If there are no arguments we use "query"
if (count($args) == 0) { if ($this->emulate_prepares || count($args) == 0) {
if (!$retval = $this->connection->query($sql)) { if (!$retval = $this->connection->query($this->replaceParameters($sql, $args))) {
$errorInfo = $this->connection->errorInfo(); $errorInfo = $this->connection->errorInfo();
$this->error = $errorInfo[2]; $this->error = $errorInfo[2];
$this->errorno = $errorInfo[1]; $this->errorno = $errorInfo[1];
@ -562,7 +567,7 @@ class Database
$can_be_prepared = in_array($command, ['select', 'update', 'insert', 'delete']); $can_be_prepared = in_array($command, ['select', 'update', 'insert', 'delete']);
// The fallback routine is called as well when there are no arguments // The fallback routine is called as well when there are no arguments
if (!$can_be_prepared || (count($args) == 0)) { if ($this->emulate_prepares || !$can_be_prepared || (count($args) == 0)) {
$retval = $this->connection->query($this->replaceParameters($sql, $args)); $retval = $this->connection->query($this->replaceParameters($sql, $args));
if ($this->connection->errno) { if ($this->connection->errno) {
$this->error = $this->connection->error; $this->error = $this->connection->error;