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
classes/shop/GroupShop.php
+4 -4
View File
@@ -75,7 +75,7 @@ class GroupShopCore extends ObjectModel
public static function getGroupShops($active = true)
{
return Db::getInstance()->ExecuteS('SELECT *
return Db::getInstance()->executeS('SELECT *
FROM '._DB_PREFIX_.'group_shop
WHERE `deleted`= 0 AND `active`='.(int)$active);
}
@@ -92,7 +92,7 @@ class GroupShopCore extends ObjectModel
$id = 'id_group_shop';
else
$table_name .= '_'.$row['type'];
$res &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.$table_name.'` WHERE `'.$id.'`='.(int)$this->id);
$res &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.$table_name.'` WHERE `'.$id.'`='.(int)$this->id);
}
return $res;
@@ -164,12 +164,12 @@ class GroupShopCore extends ObjectModel
$sql = 'INSERT IGNORE INTO `'._DB_PREFIX_.$table_name.'` ('.$keys.', '.$id.')
(SELECT '.$keys.', '.(int)$this->id.' FROM '._DB_PREFIX_.$table_name.'
WHERE `'.$id.'` = '.(int)$old_id.')';
Db::getInstance()->Execute($sql);
Db::getInstance()->execute($sql);
}
}
else
{
//Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.$table_name.'` SET WHERE `'.$id.'`='.(int)$old_id);
//Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.$table_name.'` SET WHERE `'.$id.'`='.(int)$old_id);
}
}
}
classes/shop/Shop.php
+5 -5
View File
@@ -175,7 +175,7 @@ class ShopCore extends ObjectModel
$id = 'id_shop';
else
$table_name .= '_'.$row['type'];
$res &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.$table_name.'` WHERE `'.$id.'`='.(int)$this->id);
$res &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.$table_name.'` WHERE `'.$id.'`='.(int)$this->id);
}
Shop::cacheShops(true);
@@ -340,7 +340,7 @@ class ShopCore extends ObjectModel
FROM '._DB_PREFIX.'shop_url
WHERE active = 1
AND id_shop = '.(int)$this->id;
return Db::getInstance()->ExecuteS($sql);
return Db::getInstance()->executeS($sql);
}
/**
@@ -399,7 +399,7 @@ class ShopCore extends ObjectModel
'.$where.'
ORDER BY gs.name, s.name';
if ($results = Db::getInstance()->ExecuteS($sql))
if ($results = Db::getInstance()->executeS($sql))
{
$group_shop = new GroupShop();
foreach ($results as $row)
@@ -790,12 +790,12 @@ class ShopCore extends ObjectModel
$sql = 'INSERT IGNORE INTO `'._DB_PREFIX_.$table_name.'` ('.$keys.', '.$id.')
(SELECT '.$keys.', '.(int)$this->id.' FROM '._DB_PREFIX_.$table_name.'
WHERE `'.$id.'` = '.(int)$old_id.')';
Db::getInstance()->Execute($sql);
Db::getInstance()->execute($sql);
}
}
/*else
{
Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.$table_name.'` SET WHERE `'.$id.'`='.(int)$old_id);
Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.$table_name.'` SET WHERE `'.$id.'`='.(int)$old_id);
}*/
}
}
classes/shop/ShopUrl.php
+1 -1
View File
@@ -84,7 +84,7 @@ class ShopUrlCore extends ObjectModel
FROM '._DB_PREFIX_.'shop_url
WHERE 1
'.($id_shop ? ' AND id_shop = '.(int)$id_shop : '');
return Db::getInstance()->ExecuteS($sql);
return Db::getInstance()->executeS($sql);
}
public function setMain()