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

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-10-10 12:18:56 +00:00
parent 251dd966b7
commit 577221ff08
280 changed files with 1971 additions and 1966 deletions
+4 -4
View File
@@ -90,16 +90,16 @@ class Dejala extends CarrierModule
if (!isset($this->dejalaConfig->internal_version) || $this->dejalaConfig->internal_version < $this->internal_version)
{
$this->unregisterHook('cart') ;
$res = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'dejala_cart` LIMIT 1') ;
$res = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'dejala_cart` LIMIT 1') ;
if ($res)
{
if (!array_key_exists('cart_date_upd', (int)$res[0]))
{
Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'dejala_cart` ADD COLUMN cart_date_upd DATETIME DEFAULT 0;');
Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'dejala_cart` ADD COLUMN cart_date_upd DATETIME DEFAULT 0;');
}
if (!array_key_exists('delivery_price', (int)$res[0]))
{
Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'dejala_cart` ADD COLUMN delivery_price FLOAT DEFAULT NULL;');
Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'dejala_cart` ADD COLUMN delivery_price FLOAT DEFAULT NULL;');
}
}
$this->dejalaConfig->internal_version = $this->internal_version ;
@@ -125,7 +125,7 @@ class Dejala extends CarrierModule
foreach ($sql as $query)
if (!empty($query))
{
if (!Db::getInstance()->Execute(trim($query)))
if (!Db::getInstance()->execute(trim($query)))
return (false);
}