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

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
+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);
}
+1 -1
View File
@@ -70,7 +70,7 @@ class DejalaCarrierUtils
$carrier->addZone((int)$id_zone) ;
/*$sql = 'INSERT INTO `'._DB_PREFIX_.'carrier_zone` (`id_carrier` , `id_zone`) VALUES ('.(int)($carrier->id).', ' . (int)($id_zone) . ')';
Db::getInstance()->Execute($sql);
Db::getInstance()->execute($sql);
$rangeW = new RangeWeight();
$rangeW->id_carrier = $carrier->id;
+1 -1
View File
@@ -65,7 +65,7 @@ class DejalaCart extends ObjectModel
parent::save($nullValues, $autodate) ;
if (isset($this->wanted_cart_id))
{
Db::getInstance()->Execute('UPDATE ' . _DB_PREFIX_ . $this->table . ' SET ' . $this->identifier . ' = ' . (int)$this->wanted_cart_id . ' WHERE ' . $this->identifier . ' = ' . (int)$this->id);
Db::getInstance()->execute('UPDATE ' . _DB_PREFIX_ . $this->table . ' SET ' . $this->identifier . ' = ' . (int)$this->wanted_cart_id . ' WHERE ' . $this->identifier . ' = ' . (int)$this->id);
$this->id = (int)$this->wanted_cart_id ;
unset($this->wanted_cart_id) ;
}