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
install-dev/xml/checkShopInfos.php
+2 -2
View File
@@ -149,11 +149,11 @@ if(isFormValid())
foreach ($_GET['infosWL'] AS $wl)
$sqlLanguages[] = "INSERT INTO `"._DB_PREFIX_."lang` (`id_lang` ,`name` ,`active` ,`iso_code`)VALUES (NULL , '".ToolsInstall::getLangString($wl)."', '1', '".pSQL($wl)."')";
foreach($sqlLanguages AS $query)
if(!Db::getInstance()->Execute($query))
if(!Db::getInstance()->execute($query))
$error['infosLanguages'] = '11';
// Flags copy
if(!$languagesId = Db::getInstance()->ExecuteS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang`'))
if(!$languagesId = Db::getInstance()->executeS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang`'))
$error['infosLanguages'] = '11';
unset($dbInstance);*/
install-dev/xml/createDB.php
+4 -4
View File
@@ -131,7 +131,7 @@ switch (_DB_TYPE_) {
foreach($db_structure_settings as $query){
$query = trim($query);
if(!empty($query)){
if(!Db::getInstance()->Execute($query)){
if(!Db::getInstance()->execute($query)){
if(Db::getInstance()->getNumberError() == 1050){
$logger->logError('A Prestashop database already exists, please drop it or change the prefix.');
die('<action result="fail" error="14" />'."\n");
@@ -185,7 +185,7 @@ switch (_DB_TYPE_) {
foreach($db_data_settings as $query){
$query = trim($query);
if(!empty($query)){
if(!Db::getInstance()->Execute($query)){
if(!Db::getInstance()->execute($query)){
if(Db::getInstance()->getNumberError() == 1050){
die('<action result="fail" error="14" />'."\n");
} else {
@@ -208,13 +208,13 @@ switch (_DB_TYPE_) {
}
$xml = '<result><action result="ok" error="" />'."\n";
$countries = Db::getInstance()->ExecuteS('
$countries = Db::getInstance()->executeS('
SELECT c.`id_country`, cl.`name`, c.`iso_code` FROM `'.$_GET['tablePrefix'].'country` c
INNER JOIN `'.$_GET['tablePrefix'].'country_lang` cl ON (c.`id_country` = cl.`id_country`)
WHERE cl.`id_lang` = '.(int)($_GET['language'] + 1).'
ORDER BY cl.`name`');
$timezones = Db::getInstance()->ExecuteS('
$timezones = Db::getInstance()->executeS('
SELECT * FROM `'.$_GET['tablePrefix'].'timezone`
ORDER BY `name`');
install-dev/xml/doUpgrade.php
+1 -1
View File
@@ -394,7 +394,7 @@ foreach($sqlContent as $query)
<sqlQuery><![CDATA['.htmlentities($query).']]></sqlQuery>
</request>'."\n";
}
elseif(!Db::getInstance()->Execute($query))
elseif(!Db::getInstance()->execute($query))
{
$logger->logError('SQL query: '."\r\n".$query);
$logger->logError('SQL error: '."\r\n".Db::getInstance()->getMsgError());