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

// Db::autoExecute() call are now replaced by Db::insert() or Db::update()

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12625 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-23 17:46:16 +00:00
parent a4d97911b1
commit 42eb6b476c
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-new/classes/xmlLoader.php
+3 -3
View File
@@ -391,11 +391,11 @@ class InstallXmlLoader
{ {
foreach ($this->delayed_inserts as $entity => $queries) foreach ($this->delayed_inserts as $entity => $queries)
{ {
$type = 'INSERT IGNORE'; $type = Db::INSERT_IGNORE;
if ($entity == 'access') if ($entity == 'access')
$type = 'REPLACE'; $type = Db::REPLACE;
if (!Db::getInstance()->autoExecute(_DB_PREFIX_.$entity, $queries, $type)) if (!Db::getInstance()->insert($entity, $queries, false, true, $type))
$this->setError($this->language->l('An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>', $entity, Db::getInstance()->getMsgError())); $this->setError($this->language->l('An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>', $entity, Db::getInstance()->getMsgError()));
unset($this->delayed_inserts[$entity]); unset($this->delayed_inserts[$entity]);
} }
install-new/upgrade/php/generate_root_category_for_multishop.php
+2 -2
View File
@@ -32,7 +32,7 @@ function generate_root_category_for_multishop()
'name' => 'Root', 'name' => 'Root',
'link_rewrite' => '', 'link_rewrite' => '',
); );
Db::getInstance()->autoExecute(_DB_PREFIX_.'category_lang', $data, 'INSERT'); Db::getInstance()->insert('category_lang', $data);
$categories = Db::getInstance()->executeS(' $categories = Db::getInstance()->executeS('
SELECT `id_category` SELECT `id_category`
@@ -45,7 +45,7 @@ function generate_root_category_for_multishop()
'id_category' => $category['id_category'], 'id_category' => $category['id_category'],
'id_shop' => $shop['id_shop'] 'id_shop' => $shop['id_shop']
); );
Db::getInstance()->autoExecute(_DB_PREFIX_.'category_shop', $data, 'INSERT'); Db::getInstance()->insert('category_shop', $data);
Db::getInstance()->execute(' Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'category` UPDATE `'._DB_PREFIX_.'category`
install-new/upgrade/php/generate_tax_rules.php
+1 -1
View File
@@ -40,7 +40,7 @@ function generate_tax_rules()
'id_tax' => $id_tax, 'id_tax' => $id_tax,
'name' => 'Rule '.$tax['rate'].'%', 'name' => 'Rule '.$tax['rate'].'%',
); );
Db::getInstance()->AutoExecute(_DB_PREFIX_.'category_group', $row, 'INSERT'); Db::getInstance()->insert('category_group', $row);
$id_tax_rules_group = Db::getInstance()->insert_id; $id_tax_rules_group = Db::getInstance()->insert_id;
install-new/upgrade/php/migrate_block_info_to_cms_block.php
+3 -3
View File
@@ -44,8 +44,8 @@ function migrate_block_info_to_cms_block()
FROM `'._DB_PREFIX_.'configuration` FROM `'._DB_PREFIX_.'configuration`
WHERE name="PS_LANG_DEFAULT"'); WHERE name="PS_LANG_DEFAULT"');
// 2) parent::install() // 2) parent::install()
$result = Db::getInstance()->AutoExecute(_DB_PREFIX_.'module', $result = Db::getInstance()->insert('module',
array('name' => 'blockcms', 'active' => 1), 'INSERT'); array('name' => 'blockcms', 'active' => 1));
$id_module = Db::getInstance()->insert_Id(); $id_module = Db::getInstance()->insert_Id();
// 3) hooks // 3) hooks
$hooks = array('leftColumn', 'rightColumn', 'footer', 'header'); $hooks = array('leftColumn', 'rightColumn', 'footer', 'header');
@@ -56,7 +56,7 @@ function migrate_block_info_to_cms_block()
FROM `'._DB_PREFIX_.'hook_module` hm FROM `'._DB_PREFIX_.'hook_module` hm
LEFT JOIN `'._DB_PREFIX_.'hook` h on hm.id_hook=h.id_hook LEFT JOIN `'._DB_PREFIX_.'hook` h on hm.id_hook=h.id_hook
WHERE h.name = "'.$hook_name.'" group by id_hook'); WHERE h.name = "'.$hook_name.'" group by id_hook');
$res &= Db::getInstance()->AutoExecute(_DB_PREFIX_.'hook_module', $row, 'INSERT'); $res &= Db::getInstance()->insert('hook_module', $row);
} }
// module install // module install
install-new/upgrade/php/module_reinstall_blockmyaccount.php
+1 -1
View File
@@ -43,7 +43,7 @@ function module_reinstall_blockmyaccount()
FROM `'._DB_PREFIX_.'hook_module` hm FROM `'._DB_PREFIX_.'hook_module` hm
LEFT JOIN `'._DB_PREFIX_.'hook` h on hm.id_hook=h.id_hook LEFT JOIN `'._DB_PREFIX_.'hook` h on hm.id_hook=h.id_hook
WHERE h.name = "'.$hook_name.'" group by id_hook'); WHERE h.name = "'.$hook_name.'" group by id_hook');
$res &= Db::getInstance()->AutoExecute(_DB_PREFIX_.'hook_module', $row, 'INSERT'); $res &= Db::getInstance()->insert('hook_module', $row);
} }
return $res; return $res;
} }
install-new/upgrade/php/module_reinstall_blocksearch.php
+1 -1
View File
@@ -43,7 +43,7 @@ function module_reinstall_blocksearch()
FROM `'._DB_PREFIX_.'hook_module` hm FROM `'._DB_PREFIX_.'hook_module` hm
LEFT JOIN `'._DB_PREFIX_.'hook` h on hm.id_hook=h.id_hook LEFT JOIN `'._DB_PREFIX_.'hook` h on hm.id_hook=h.id_hook
WHERE h.name = "'.$hook_name.'" group by id_hook'); WHERE h.name = "'.$hook_name.'" group by id_hook');
$res &= Db::getInstance()->AutoExecute(_DB_PREFIX_.'hook_module', $row, 'INSERT'); $res &= Db::getInstance()->insert('hook_module', $row);
} }
return $res; return $res;
} }
install-new/upgrade/php/setAllGroupsOnHomeCategory.php
+3 -3
View File
@@ -35,13 +35,13 @@ function setAllGroupsOnHomeCategory()
foreach ($results AS $result) foreach ($results AS $result)
$groups[] = $result['id_group']; $groups[] = $result['id_group'];
if (is_array($groups) && sizeof($groups)) if (is_array($groups) && count($groups))
{ {
// cleanGroups // cleanGroups
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_group` Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_group`
WHERE `id_category` = 1'); WHERE `id_category` = 1');
// addGroups($groups); // addGroups($groups);
$row = array('id_category' => 1, 'id_group' => (int)($groups)); $row = array('id_category' => 1, 'id_group' => (int)$groups);
Db::getInstance()->autoExecute(_DB_PREFIX_.'category_group', $row, 'INSERT'); Db::getInstance()->insert('category_group', $row);
} }
} }