dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix DbQuery for PHP < 5.2

Browse Source
This commit is contained in:
rMalie
2011-12-08 16:32:59 +00:00
parent 83cae5d2f3
commit 8cb26f81e6
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/db/Db.php
+17 -6
View File
@@ -346,7 +346,9 @@ abstract class DbCore
*/ */
public function query($sql) public function query($sql)
{ {
$sql = (string)$sql; if ($sql instanceof DbQuery)
$sql = $sql->build();
$result = $this->_query($sql); $result = $this->_query($sql);
if (_PS_DEBUG_SQL_) if (_PS_DEBUG_SQL_)
$this->displayError($sql); $this->displayError($sql);
@@ -381,7 +383,9 @@ abstract class DbCore
*/ */
public function execute($sql, $use_cache = true) public function execute($sql, $use_cache = true)
{ {
$sql = (string)$sql; if ($sql instanceof DbQuery)
$sql = $sql->build();
$this->result = $this->query($sql); $this->result = $this->query($sql);
if ($use_cache && $this->is_cache_enabled) if ($use_cache && $this->is_cache_enabled)
Cache::getInstance()->deleteQuery($sql); Cache::getInstance()->deleteQuery($sql);
@@ -398,7 +402,8 @@ abstract class DbCore
*/ */
public function executeS($sql, $array = true, $use_cache = true) public function executeS($sql, $array = true, $use_cache = true)
{ {
$sql = (string)$sql; if ($sql instanceof DbQuery)
$sql = $sql->build();
// This method must be used only with queries which display results // This method must be used only with queries which display results
if (!preg_match('#^\s*(select|show|explain|describe)\s#i', $sql)) if (!preg_match('#^\s*(select|show|explain|describe)\s#i', $sql))
@@ -443,7 +448,9 @@ abstract class DbCore
*/ */
public function getRow($sql, $use_cache = true) public function getRow($sql, $use_cache = true)
{ {
$sql = (string)$sql; if ($sql instanceof DbQuery)
$sql = $sql->build();
$sql .= ' LIMIT 1'; $sql .= ' LIMIT 1';
$this->result = false; $this->result = false;
$this->last_query = $sql; $this->last_query = $sql;
@@ -473,7 +480,9 @@ abstract class DbCore
*/ */
public function getValue($sql, $use_cache = true) public function getValue($sql, $use_cache = true)
{ {
$sql = (string)$sql; if ($sql instanceof DbQuery)
$sql = $sql->build();
if (!$result = $this->getRow($sql, $use_cache)) if (!$result = $this->getRow($sql, $use_cache))
return false; return false;
return array_shift($result); return array_shift($result);
@@ -508,7 +517,9 @@ abstract class DbCore
{ {
global $webservice_call; global $webservice_call;
$sql = (string)$sql; if ($sql instanceof DbQuery)
$sql = $sql->build();
$this->result = false; $this->result = false;
$result = $this->query($sql); $result = $this->query($sql);
if ($use_cache && $this->is_cache_enabled) if ($use_cache && $this->is_cache_enabled)