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/homeslider/HomeSlide.php
+4 -4
View File
@@ -95,7 +95,7 @@ class HomeSlide extends ObjectModel
$id_shop = $context->shop->getID();
$res = parent::add($autodate, $nullValues);
$res &= Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute('
$res &= Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'homeslider` (`id_shop`, `id_slide`)
VALUES('.(int)$id_shop.', '.(int)$this->id.')'
);
@@ -113,7 +113,7 @@ class HomeSlide extends ObjectModel
}
$res &= $this->reOrderPositions();
$res &= Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute('
$res &= Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'homeslider`
WHERE `id_slide` = '.(int)$this->id
);
@@ -128,7 +128,7 @@ class HomeSlide extends ObjectModel
$context = Context::getContext();
$id_shop = $context->shop->getID();
$max = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
$max = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT MAX(hss.`position`) as position
FROM `'._DB_PREFIX_.'homeslider_slides` hss, `'._DB_PREFIX_.'homeslider` hs
WHERE hss.`id_slide` = hs.`id_slide` AND hs.`id_shop` = '.(int)$id_shop
@@ -137,7 +137,7 @@ class HomeSlide extends ObjectModel
if ((int)$max == (int)$id_slide)
return true;
$rows = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
$rows = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT hss.`position` as position, hss.`id_slide` as id_slide
FROM `'._DB_PREFIX_.'homeslider_slides` hss, `'._DB_PREFIX_.'homeslider` hs
WHERE hss.`id_slide` = hs.`id_slide` AND hs.`id_shop` = '.(int)$id_shop.' AND hss.`position` > '.(int)$this->position
modules/homeslider/ajax_homeslider.php
+1 -1
View File
@@ -42,7 +42,7 @@ if (Tools::getValue('action') == 'updateSlidesPosition' && Tools::getValue('slid
foreach ($slides as $position => $id_slide)
{
$res = Db::getInstance()->Execute('
$res = Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'homeslider_slides` SET `position` = '.(int)($position).'
WHERE `id_slide` = '.(int)($id_slide)
);
modules/homeslider/homeslider.php
+5 -5
View File
@@ -85,7 +85,7 @@ class HomeSlider extends Module
protected function createTables()
{
/* Slides */
$res = Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute('
$res = Db::getInstance()->execute('
CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'homeslider` (
`id_slide` int(10) unsigned NOT NULL AUTO_INCREMENT,
`id_shop` int(10) unsigned NOT NULL,
@@ -94,7 +94,7 @@ class HomeSlider extends Module
');
/* Slides configuration */
$res &= Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute('
$res &= Db::getInstance()->execute('
CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'homeslider_slides` (
`id_slide` int(10) unsigned NOT NULL AUTO_INCREMENT,
`position` int(10) unsigned NOT NULL DEFAULT \'0\',
@@ -104,7 +104,7 @@ class HomeSlider extends Module
');
/* Slides lang configuration */
$res &= Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute('
$res &= Db::getInstance()->execute('
CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'homeslider_slides_lang` (
`id_slide` int(10) unsigned NOT NULL,
`id_lang` int(10) unsigned NOT NULL,
@@ -128,7 +128,7 @@ class HomeSlider extends Module
$to_del = new HomeSlide($slide['id_slide']);
$to_del->delete();
}
return Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute('
return Db::getInstance()->execute('
DROP TABLE `'._DB_PREFIX_.'homeslider`, `'._DB_PREFIX_.'homeslider_slides`, `'._DB_PREFIX_.'homeslider_slides_lang`;
');
}
@@ -629,7 +629,7 @@ class HomeSlider extends Module
$idShop = $this->context->shop->getID();
$idLang = $this->context->language->id;
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT hs.`id_slide` AS id_slide, hssl.`image` as image, hss.`position` AS position, hss.`active` as active, hssl.`title` as title, hssl.`url` as url, hssl.`legend` as legend
FROM `'._DB_PREFIX_.'homeslider` hs, `'._DB_PREFIX_.'homeslider_slides` hss, `'._DB_PREFIX_.'homeslider_slides_lang` hssl
WHERE hs.`id_shop` = '.(int)$idShop.((int)$idShop != 0 ? ' OR hs.`id_shop` = 0' : '').' AND hs.`id_slide` = hss.`id_slide` AND hss.`id_slide` = hssl.`id_slide` AND hs.`id_slide` = hssl.`id_slide`