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

// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names

Browse Source
This commit is contained in:
rMalie
2011-10-10 12:18:56 +00:00
parent 149c814a45
commit 9510337b1d
280 changed files with 1971 additions and 1966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/productcomments/ProductComment.php
+12 -12
View File
@@ -108,7 +108,7 @@ class ProductComment extends ObjectModel
if ($n != null && $n <= 0)
$n = 5;
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT pc.`id_product_comment`,
(SELECT count(*) FROM `'._DB_PREFIX_.'product_comment_usefulness` pcu WHERE pcu.`id_product_comment` = pc.`id_product_comment` AND pcu.`usefulness` = 1) as total_useful,
(SELECT count(*) FROM `'._DB_PREFIX_.'product_comment_usefulness` pcu WHERE pcu.`id_product_comment` = pc.`id_product_comment`) as total_advice, '.
@@ -129,7 +129,7 @@ class ProductComment extends ObjectModel
*/
public static function getByCustomer($id_product, $id_customer, $last = false, $id_guest = false)
{
$results = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->executeS('
SELECT *
FROM `'._DB_PREFIX_.'product_comment` pc
WHERE pc.`id_product` = '.(int)$id_product.'
@@ -159,7 +159,7 @@ class ProductComment extends ObjectModel
$validate = Configuration::get('PRODUCT_COMMENTS_MODERATE');
return (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
return (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT pc.`id_product_comment`, pcg.`grade`, pccl.`name`, pcc.`id_product_comment_criterion`
FROM `'._DB_PREFIX_.'product_comment` pc
LEFT JOIN `'._DB_PREFIX_.'product_comment_grade` pcg ON (pcg.`id_product_comment` = pc.`id_product_comment`)
@@ -250,7 +250,7 @@ class ProductComment extends ObjectModel
*/
public static function getByValidate($validate = '0', $deleted = false)
{
return (Db::getInstance()->ExecuteS('
return (Db::getInstance()->executeS('
SELECT pc.`id_product_comment`, pc.`id_product`, IF(c.id_customer, CONCAT(c.`firstname`, \' \', c.`lastname`), pc.customer_name) customer_name, pc.`content`, pc.`grade`, pc.`date_add`, pl.`name`
FROM `'._DB_PREFIX_.'product_comment` pc
LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = pc.`id_customer`)
@@ -266,7 +266,7 @@ class ProductComment extends ObjectModel
*/
public static function getAll()
{
return (Db::getInstance()->ExecuteS('
return (Db::getInstance()->executeS('
SELECT pc.`id_product_comment`, pc.`id_product`, IF(c.id_customer, CONCAT(c.`firstname`, \' \', c.`lastname`), pc.customer_name) customer_name, pc.`content`, pc.`grade`, pc.`date_add`, pl.`name`
FROM `'._DB_PREFIX_.'product_comment` pc
LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = pc.`id_customer`)
@@ -283,7 +283,7 @@ class ProductComment extends ObjectModel
{
if (!Validate::isUnsignedId($this->id))
die(Tools::displayError());
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'product_comment` SET
`validate` = '.(int)$validate.'
WHERE `id_product_comment` = '.(int)$this->id));
@@ -298,7 +298,7 @@ class ProductComment extends ObjectModel
{
if (!Validate::isUnsignedId($id_product_comment))
die(Tools::displayError());
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_comment_grade`
WHERE `id_product_comment` = '.(int)$id_product_comment));
}
@@ -312,7 +312,7 @@ class ProductComment extends ObjectModel
{
if (!Validate::isUnsignedId($id_product_comment))
die(Tools::displayError());
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_comment_report`
WHERE `id_product_comment` = '.(int)$id_product_comment));
}
@@ -327,7 +327,7 @@ class ProductComment extends ObjectModel
if (!Validate::isUnsignedId($id_product_comment))
die(Tools::displayError());
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_comment_usefulness`
WHERE `id_product_comment` = '.(int)$id_product_comment));
}
@@ -339,7 +339,7 @@ class ProductComment extends ObjectModel
*/
public static function reportComment($id_product_comment, $id_customer)
{
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'product_comment_report` (`id_product_comment`, `id_customer`)
VALUES ('.(int)$id_product_comment.', '.(int)$id_customer.')'));
}
@@ -365,7 +365,7 @@ class ProductComment extends ObjectModel
*/
public static function setCommentUsefulness($id_product_comment, $usefulness, $id_customer)
{
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'product_comment_usefulness` (`id_product_comment`, `usefulness`, `id_customer`)
VALUES ('.(int)$id_product_comment.', '.(int)$usefulness.', '.(int)$id_customer.')'));
}
@@ -391,7 +391,7 @@ class ProductComment extends ObjectModel
*/
public static function getReportedComments()
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT DISTINCT(pc.`id_product_comment`), pc.`id_product`, IF(c.id_customer, CONCAT(c.`firstname`, \' \', c.`lastname`), pc.customer_name) customer_name, pc.`content`, pc.`grade`, pc.`date_add`, pl.`name`
FROM `'._DB_PREFIX_.'product_comment_report` pcr
LEFT JOIN `'._DB_PREFIX_.'product_comment` pc
modules/productcomments/ProductCommentCriterion.php
+14 -14
View File
@@ -57,15 +57,15 @@ class ProductCommentCriterion extends ObjectModel
if (!parent::delete())
return false;
if ($this->id_product_comment_criterion_type == 2)
if (!Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_category
if (!Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_category
WHERE id_product_comment_criterion='.(int)$this->id))
return false;
elseif ($this->id_product_comment_criterion_type == 3)
if (!Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_product
if (!Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_product
WHERE id_product_comment_criterion='.(int)$this->id))
return false;
return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_comment_grade`
return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_comment_grade`
WHERE `id_product_comment_criterion` = '.(int)$this->id);
}
@@ -77,10 +77,10 @@ class ProductCommentCriterion extends ObjectModel
if ($previousUpdate->id_product_comment_criterion_type != $this->id_product_comment_criterion_type)
{
if ($previousUpdate->id_product_comment_criterion_type == 2)
return Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_category
return Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_category
WHERE id_product_comment_criterion='.(int)$previousUpdate->id);
elseif ($previousUpdate->id_product_comment_criterion_type == 3)
return Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_product
return Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_product
WHERE id_product_comment_criterion='.(int)$previousUpdate->id);
}
return true;
@@ -95,7 +95,7 @@ class ProductCommentCriterion extends ObjectModel
{
if (!Validate::isUnsignedId($id_product))
die(Tools::displayError());
return (Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'product_comment_criterion_product` (`id_product_comment_criterion`, `id_product`)
return (Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'product_comment_criterion_product` (`id_product_comment_criterion`, `id_product`)
VALUES('.(int)$this->id.','.(int)$id_product.')'));
}
@@ -108,7 +108,7 @@ class ProductCommentCriterion extends ObjectModel
{
if (!Validate::isUnsignedId($id_category))
die(Tools::displayError());
return (Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'product_comment_criterion_category` (`id_product_comment_criterion`, `id_category`)
return (Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'product_comment_criterion_category` (`id_product_comment_criterion`, `id_category`)
VALUES('.(int)$this->id.','.(int)$id_category.')'));
}
@@ -125,7 +125,7 @@ class ProductCommentCriterion extends ObjectModel
$grade = 0;
else if ($grade > 10)
$grade = 10;
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'product_comment_grade`
(`id_product_comment`, `id_product_comment_criterion`, `grade`) VALUES(
'.(int)($id_product_comment).',
@@ -143,7 +143,7 @@ class ProductCommentCriterion extends ObjectModel
if (!Validate::isUnsignedId($id_product) ||
!Validate::isUnsignedId($id_lang))
die(Tools::displayError());
return Db::getInstance()->ExecuteS('
return Db::getInstance()->executeS('
SELECT pcc.`id_product_comment_criterion`, pccl.`name`
FROM `'._DB_PREFIX_.'product_comment_criterion` pcc
LEFT JOIN `'._DB_PREFIX_.'product_comment_criterion_lang` pccl ON (pcc.id_product_comment_criterion = pccl.id_product_comment_criterion)
@@ -163,7 +163,7 @@ class ProductCommentCriterion extends ObjectModel
{
if (!Validate::isUnsignedId($id_lang))
die(Tools::displayError());
return (Db::getInstance()->ExecuteS('
return (Db::getInstance()->executeS('
SELECT pcc.`id_product_comment_criterion`, pcc.id_product_comment_criterion_type, pccl.`name`, pcc.active
FROM `'._DB_PREFIX_.'product_comment_criterion` pcc
JOIN `'._DB_PREFIX_.'product_comment_criterion_lang` pccl ON (pcc.id_product_comment_criterion = pccl.id_product_comment_criterion)
@@ -173,7 +173,7 @@ class ProductCommentCriterion extends ObjectModel
public function getProducts()
{
$res = Db::getInstance()->ExecuteS('
$res = Db::getInstance()->executeS('
SELECT pccp.id_product, pccp.id_product_comment_criterion
FROM `'._DB_PREFIX_.'product_comment_criterion_product` pccp
WHERE pccp.id_product_comment_criterion = '.(int)$this->id);
@@ -186,7 +186,7 @@ class ProductCommentCriterion extends ObjectModel
public function getCategories()
{
$res = Db::getInstance()->ExecuteS('
$res = Db::getInstance()->executeS('
SELECT pccc.id_category, pccc.id_product_comment_criterion
FROM `'._DB_PREFIX_.'product_comment_criterion_category` pccc
WHERE pccc.id_product_comment_criterion = '.(int)$this->id);
@@ -199,12 +199,12 @@ class ProductCommentCriterion extends ObjectModel
public function deleteCategories()
{
return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_category` WHERE `id_product_comment_criterion` = '.(int)$this->id);
return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_category` WHERE `id_product_comment_criterion` = '.(int)$this->id);
}
public function deleteProducts()
{
return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_product` WHERE `id_product_comment_criterion` = '.(int)$this->id);
return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_product` WHERE `id_product_comment_criterion` = '.(int)$this->id);
}
public static function getTypes()
modules/productcomments/ProductCriterion.php
+10 -10
View File
@@ -37,7 +37,7 @@ class ProductCommentCriterion
if (!Validate::isUnsignedId($id_lang) ||
!Validate::isMessage($name))
die(Tools::displayError());
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'product_comment_criterion`
(`id_lang`, `name`) VALUES(
'.(int)($id_lang).',
@@ -54,7 +54,7 @@ class ProductCommentCriterion
if (!Validate::isUnsignedId($id_product_comment_criterion) ||
!Validate::isUnsignedId($id_product))
die(Tools::displayError());
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'product_comment_criterion_product`
(`id_product_comment_criterion`, `id_product`) VALUES(
'.(int)($id_product_comment_criterion).',
@@ -75,7 +75,7 @@ class ProductCommentCriterion
$grade = 0;
else if ($grade > 10)
$grade = 10;
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'product_comment_grade`
(`id_product_comment`, `id_product_comment_criterion`, `grade`) VALUES(
'.(int)($id_product_comment).',
@@ -94,7 +94,7 @@ class ProductCommentCriterion
!Validate::isUnsignedId($id_lang) ||
!Validate::isMessage($name))
die(Tools::displayError());
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'product_comment_criterion` SET
`name` = \''.pSQL($name).'\'
WHERE `id_product_comment_criterion` = '.(int)($id_product_comment_criterion).' AND
@@ -111,7 +111,7 @@ class ProductCommentCriterion
if (!Validate::isUnsignedId($id_product) ||
!Validate::isUnsignedId($id_lang))
die(Tools::displayError());
return (Db::getInstance()->ExecuteS('
return (Db::getInstance()->executeS('
SELECT pcc.`id_product_comment_criterion`, pcc.`name`
FROM `'._DB_PREFIX_.'product_comment_criterion` pcc
INNER JOIN `'._DB_PREFIX_.'product_comment_criterion_product` pccp ON pcc.`id_product_comment_criterion` = pccp.`id_product_comment_criterion`
@@ -128,7 +128,7 @@ class ProductCommentCriterion
{
if (!Validate::isUnsignedId($id_lang))
die(Tools::displayError());
return (Db::getInstance()->ExecuteS('
return (Db::getInstance()->executeS('
SELECT pcc.`id_product_comment_criterion`, pcc.`name`
FROM `'._DB_PREFIX_.'product_comment_criterion` pcc
WHERE pcc.`id_lang` = '.(int)($id_lang).'
@@ -144,7 +144,7 @@ class ProductCommentCriterion
{
if (!Validate::isUnsignedId($id_product))
die(Tools::displayError());
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_product`
WHERE `id_product` = '.(int)($id_product)));
}
@@ -158,17 +158,17 @@ class ProductCommentCriterion
{
if (!Validate::isUnsignedId($id_product_comment_criterion))
die(Tools::displayError());
$result = Db::getInstance()->Execute('
$result = Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_comment_grade`
WHERE `id_product_comment_criterion` = '.(int)($id_product_comment_criterion));
if ($result === false)
return ($result);
$result = Db::getInstance()->Execute('
$result = Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_product`
WHERE `id_product_comment_criterion` = '.(int)($id_product_comment_criterion));
if ($result === false)
return ($result);
return (Db::getInstance()->Execute('
return (Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_comment_criterion`
WHERE `id_product_comment_criterion` = '.(int)($id_product_comment_criterion)));
}
modules/productcomments/productcomments.php
+2 -2
View File
@@ -63,7 +63,7 @@ class ProductComments extends Module
$sql = preg_split("/;\s*[\r\n]+/", trim($sql));
foreach ($sql as $query)
if (!Db::getInstance()->Execute(trim($query)))
if (!Db::getInstance()->execute(trim($query)))
return false;
if (parent::install() == false ||
!$this->registerHook('productTab') ||
@@ -95,7 +95,7 @@ class ProductComments extends Module
public function deleteTables()
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute('
return Db::getInstance()->execute('
DROP TABLE IF EXISTS
`'._DB_PREFIX_.'product_comment`,
`'._DB_PREFIX_.'product_comment_criterion`,