diff --git a/classes/Carrier.php b/classes/Carrier.php index 2d36d0010..56787eb7f 100644 --- a/classes/Carrier.php +++ b/classes/Carrier.php @@ -203,7 +203,7 @@ class CarrierCore extends ObjectModel { if (!parent::delete()) return false; - return (Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'cart_rule_carrier WHERE id_carrier = '.(int)$this->id) && + return (Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_rule_carrier WHERE id_carrier = '.(int)$this->id) && $this->deleteTaxRulesGroup(Shop::getShops(true, null, true))); } diff --git a/classes/Cart.php b/classes/Cart.php index c40296c81..b3fe4739a 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -1028,7 +1028,7 @@ class CartCore extends ObjectModel { Cache::clean('Cart::getCartRules'.$this->id); - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'cart_cart_rule` WHERE `id_cart_rule` = '.(int)$id_cart_rule.' AND `id_cart` = '.(int)$this->id.' diff --git a/classes/CartRule.php b/classes/CartRule.php index c4f20aae9..258fade56 100644 --- a/classes/CartRule.php +++ b/classes/CartRule.php @@ -131,15 +131,15 @@ class CartRuleCore extends ObjectModel Configuration::updateGlobalValue('PS_CART_RULE_FEATURE_ACTIVE', CartRule::isCurrentlyUsed($this->def['table'], true)); - $r = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_cart_rule` WHERE `id_cart_rule` = '.(int)$this->id); - $r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_carrier` WHERE `id_cart_rule` = '.(int)$this->id); - $r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_shop` WHERE `id_cart_rule` = '.(int)$this->id); - $r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_group` WHERE `id_cart_rule` = '.(int)$this->id); - $r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$this->id); - $r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$this->id.' OR `id_cart_rule_2` = '.(int)$this->id); - $r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_group` WHERE `id_cart_rule` = '.(int)$this->id); - $r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_product_rule_group` NOT IN (SELECT `id_product_rule_group` FROM `'._DB_PREFIX_.'cart_rule_product_rule_group`)'); - $r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)'); + $r = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_cart_rule` WHERE `id_cart_rule` = '.(int)$this->id); + $r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_carrier` WHERE `id_cart_rule` = '.(int)$this->id); + $r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_shop` WHERE `id_cart_rule` = '.(int)$this->id); + $r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_group` WHERE `id_cart_rule` = '.(int)$this->id); + $r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$this->id); + $r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$this->id.' OR `id_cart_rule_2` = '.(int)$this->id); + $r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_group` WHERE `id_cart_rule` = '.(int)$this->id); + $r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_product_rule_group` NOT IN (SELECT `id_product_rule_group` FROM `'._DB_PREFIX_.'cart_rule_product_rule_group`)'); + $r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)'); return $r; } @@ -153,26 +153,26 @@ class CartRuleCore extends ObjectModel */ public static function copyConditions($id_cart_rule_source, $id_cart_rule_destination) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cart_rule_shop` (`id_cart_rule`, `id_shop`) (SELECT '.(int)$id_cart_rule_destination.', id_shop FROM `'._DB_PREFIX_.'cart_rule_shop` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cart_rule_carrier` (`id_cart_rule`, `id_carrier`) (SELECT '.(int)$id_cart_rule_destination.', id_carrier FROM `'._DB_PREFIX_.'cart_rule_carrier` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cart_rule_group` (`id_cart_rule`, `id_group`) (SELECT '.(int)$id_cart_rule_destination.', id_group FROM `'._DB_PREFIX_.'cart_rule_group` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cart_rule_country` (`id_cart_rule`, `id_country`) (SELECT '.(int)$id_cart_rule_destination.', id_country FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`) (SELECT '.(int)$id_cart_rule_destination.', IF(id_cart_rule_1 != '.(int)$id_cart_rule_source.', id_cart_rule_1, id_cart_rule_2) FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$id_cart_rule_source.' OR `id_cart_rule_2` = '.(int)$id_cart_rule_source.')'); // Todo : should be changed soon, be must be copied too - // Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_cart_rule` = '.(int)$this->id); - // Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)'); + // Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_cart_rule` = '.(int)$this->id); + // Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)'); } /** @@ -287,7 +287,7 @@ class CartRuleCore extends ObjectModel return array(); $productRuleGroups = array(); - $results = Db::getInstance()->ExecuteS(' + $results = Db::getInstance()->executeS(' SELECT * FROM '._DB_PREFIX_.'cart_rule_product_rule_group prg WHERE prg.id_cart_rule = '.(int)$this->id, false); @@ -310,7 +310,7 @@ class CartRuleCore extends ObjectModel return array(); $productRules = array(); - $results = Db::getInstance()->ExecuteS(' + $results = Db::getInstance()->executeS(' SELECT * FROM '._DB_PREFIX_.'cart_rule_product_rule pr LEFT JOIN '._DB_PREFIX_.'cart_rule_product_rule_value prv ON pr.id_product_rule = prv.id_product_rule @@ -520,7 +520,7 @@ class CartRuleCore extends ObjectModel switch ($productRule['type']) { case 'attributes': - $cartAttributes = Db::getInstance()->ExecuteS(' + $cartAttributes = Db::getInstance()->executeS(' SELECT cp.quantity, cp.`id_product`, pac.`id_attribute`, cp.`id_product_attribute` FROM `'._DB_PREFIX_.'cart_product` cp LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON cp.id_product_attribute = pac.id_product_attribute @@ -540,7 +540,7 @@ class CartRuleCore extends ObjectModel $eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect'); break; case 'products': - $cartProducts = Db::getInstance()->ExecuteS(' + $cartProducts = Db::getInstance()->executeS(' SELECT cp.quantity, cp.`id_product` FROM `'._DB_PREFIX_.'cart_product` cp WHERE cp.`id_cart` = '.(int)$context->cart->id.' @@ -558,7 +558,7 @@ class CartRuleCore extends ObjectModel $eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect'); break; case 'categories': - $cartCategories = Db::getInstance()->ExecuteS(' + $cartCategories = Db::getInstance()->executeS(' SELECT cp.quantity, cp.`id_product`, catp.`id_category` FROM `'._DB_PREFIX_.'cart_product` cp LEFT JOIN `'._DB_PREFIX_.'category_product` catp ON cp.id_product = catp.id_product @@ -577,7 +577,7 @@ class CartRuleCore extends ObjectModel $eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect'); break; case 'manufacturers': - $cartManufacturers = Db::getInstance()->ExecuteS(' + $cartManufacturers = Db::getInstance()->executeS(' SELECT cp.quantity, cp.`id_product`, p.`id_manufacturer` FROM `'._DB_PREFIX_.'cart_product` cp LEFT JOIN `'._DB_PREFIX_.'product` p ON cp.id_product = p.id_product @@ -596,7 +596,7 @@ class CartRuleCore extends ObjectModel $eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect'); break; case 'suppliers': - $cartSuppliers = Db::getInstance()->ExecuteS(' + $cartSuppliers = Db::getInstance()->executeS(' SELECT cp.quantity, cp.`id_product`, p.`id_supplier` FROM `'._DB_PREFIX_.'cart_product` cp LEFT JOIN `'._DB_PREFIX_.'product` p ON cp.id_product = p.id_product @@ -795,7 +795,7 @@ class CartRuleCore extends ObjectModel protected function getCartRuleCombinations() { $array = array(); - $array['selected'] = Db::getInstance()->ExecuteS(' + $array['selected'] = Db::getInstance()->executeS(' SELECT cr.*, crl.*, 1 as selected FROM '._DB_PREFIX_.'cart_rule cr LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)Context::getContext()->language->id.') @@ -809,7 +809,7 @@ class CartRuleCore extends ObjectModel OR '.(int)$this->id.' = id_cart_rule_2 ) )'); - $array['unselected'] = Db::getInstance()->ExecuteS(' + $array['unselected'] = Db::getInstance()->executeS(' SELECT cr.*, crl.*, 1 as selected FROM '._DB_PREFIX_.'cart_rule cr LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)Context::getContext()->language->id.') @@ -833,7 +833,7 @@ class CartRuleCore extends ObjectModel if (!Validate::isLoadedObject($this) OR $this->{$type.'_restriction'} == 0) { - $array['selected'] = Db::getInstance()->ExecuteS(' + $array['selected'] = Db::getInstance()->executeS(' SELECT t.*'.($i18n ? ', tl.*' : '').', 1 as selected FROM `'._DB_PREFIX_.$type.'` t '.($i18n ? 'LEFT JOIN `'._DB_PREFIX_.$type.'_lang` tl ON (t.id_'.$type.' = tl.id_'.$type.' AND tl.id_lang = '.(int)Context::getContext()->language->id.')' : '').' @@ -964,7 +964,7 @@ class CartRuleCore extends ObjectModel */ public static function getCartsRuleByCode($name, $id_lang) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT cr.*, crl.* FROM '._DB_PREFIX_.'cart_rule cr LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)$id_lang.') diff --git a/classes/Country.php b/classes/Country.php index 0347b5ae5..37cabf7b5 100644 --- a/classes/Country.php +++ b/classes/Country.php @@ -104,7 +104,7 @@ class CountryCore extends ObjectModel { if (!parent::delete()) return false; - return Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'cart_rule_country WHERE id_country = '.(int)$this->id); + return Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_rule_country WHERE id_country = '.(int)$this->id); } /** diff --git a/classes/Customer.php b/classes/Customer.php index f5d1fe4d2..fdda37d50 100644 --- a/classes/Customer.php +++ b/classes/Customer.php @@ -744,7 +744,7 @@ class CustomerCore extends ObjectModel public function getWsGroups() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT cg.`id_group` as id FROM '._DB_PREFIX_.'customer_group cg WHERE cg.`id_customer` = '.(int)$this->id); diff --git a/classes/Image.php b/classes/Image.php index dd0bd6c35..70f7621dc 100644 --- a/classes/Image.php +++ b/classes/Image.php @@ -276,7 +276,7 @@ class ImageCore extends ObjectModel foreach ($image_ids as $image_id) $query .= '('.(int)$id_product_attribute.', '.(int)$image_id.'), '; $query = rtrim($query, ', '); - return DB::getInstance()->Execute($query); + return DB::getInstance()->execute($query); } /** diff --git a/classes/Notification.php b/classes/Notification.php index e767d66c3..4a6a22b5f 100644 --- a/classes/Notification.php +++ b/classes/Notification.php @@ -58,7 +58,7 @@ class NotificationCore public function installDb() { - Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute('ALTER TABLE `'._DB_PREFIX_.'employee` + Db::getInstance(_PS_USE_SQL_SLAVE_)->execute('ALTER TABLE `'._DB_PREFIX_.'employee` ADD `id_last_order` INT(10) unsigned NOT NULL default "0" ADD `id_last_customer_message` INT(10) unsigned NOT NULL default "0" ADD `id_last_message` INT(10) unsigned NOT NULL default "0"'); @@ -87,7 +87,7 @@ class NotificationCore ORDER BY `id_'.bqSQL($type).'` DESC'; $json = array(); - foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql) as $key => $value) + foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql) as $key => $value) { $customer = null; $order = null; @@ -126,7 +126,7 @@ class NotificationCore if (in_array($type, $this->types)) // We update the last item viewed - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'employee` SET `id_last_'.bqSQL($type).'` = (SELECT MAX(`id_'.$type.'`) FROM `'._DB_PREFIX_.(($type == 'order') ? bqSQL($type).'s' : bqSQL($type)).'`) diff --git a/classes/Product.php b/classes/Product.php index 264488948..92bce5fcf 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -539,18 +539,18 @@ class ProductCore extends ObjectModel $return = true; $result = Db::getInstance()->executeS(' - SELECT `id_product` - FROM `'._DB_PREFIX_.'category_product` - WHERE `id_category` = '.(int)$id_category.' - ORDER BY `position`'); - $sizeof = count($result); - - for ($i = 0; $i < $sizeof; $i++) - $return &= Db::getInstance()->execute(' - UPDATE `'._DB_PREFIX_.'category_product` - SET `position` = '.(int)$i.' + SELECT `id_product` + FROM `'._DB_PREFIX_.'category_product` WHERE `id_category` = '.(int)$id_category.' - AND `id_product` = '.(int)$result[$i]['id_product']); + ORDER BY `position` + '); + $total = count($result); + + for ($i = 0; $i < $total; $i++) + $return &= Db::getInstance()->update('category_product', array( + 'position' => $i, + ), '`id_category` = '.(int)$id_category.' AND `id_product` = '.(int)$result[$i]['id_product']); + return $return; } @@ -603,23 +603,16 @@ class ProductCore extends ObjectModel public static function updateDefaultAttribute($id_product) { - $id_product_attribute = Product::getDefaultAttribute($id_product); - Db::getInstance()->execute( - 'UPDATE '._DB_PREFIX_.'product - SET cache_default_attribute = '.(int)$id_product_attribute.' - WHERE id_product = '.(int)$id_product.' - LIMIT 1' - ); + Db::getInstance()->update('product', array( + 'cache_default_attribute' => (int)Product::getDefaultAttribute($id_product), + ), 'id_product = '.(int)$id_product); } public static function updateIsVirtual($id_product) { - Db::getInstance()->execute( - 'UPDATE '._DB_PREFIX_.'product - SET is_virtual = 1 - WHERE id_product = '.(int)$id_product.' - LIMIT 1' - ); + Db::getInstance()->update('product', array( + 'is_virtual' => (int)$id_product, + ), 'id_product = '.(int)$id_product); } /** @@ -706,12 +699,7 @@ class ProductCore extends ObjectModel public function deleteFromSupplier() { - $return = Db::getInstance()->execute( - 'DELETE FROM `'._DB_PREFIX_.'product_supplier` - WHERE `id_product` = '.(int)$this->id - ); - - return $return; + return Db::getInstance()->delete('product_supplier', 'id_product = '.(int)$this->id); } /** @@ -753,12 +741,13 @@ class ProductCore extends ObjectModel foreach ($categories as $new_id_categ) if (!in_array($new_id_categ, $current_categories)) - $product_cats[] = '('.$new_id_categ.', '.(int)$this->id.', '.$new_categ_pos[$new_id_categ].')'; - if (count($product_cats)) - return Db::getInstance()->execute(' - INSERT INTO `'._DB_PREFIX_.'category_product` (`id_category`, `id_product`, `position`) - VALUES '.implode(',', $product_cats)); + $product_cats[] = array( + 'id_category' => (int)$new_id_categ, + 'id_product' => (int)$this->id, + 'position' => (int)$new_categ_pos[$new_id_categ], + ); + Db::getInstance()->insert('category_product', $product_cats); return true; } @@ -775,10 +764,12 @@ class ProductCore extends ObjectModel return false; // get max position in each categories - $result = Db::getInstance()->executeS('SELECT `id_category` - FROM `'._DB_PREFIX_.'category_product` - WHERE `id_category` NOT IN('.implode(',', array_map('intval', $categories)).') - AND id_product = '.$this->id.''); + $result = Db::getInstance()->executeS(' + SELECT `id_category` + FROM `'._DB_PREFIX_.'category_product` + WHERE `id_category` NOT IN('.implode(',', array_map('intval', $categories)).') + AND id_product = '.$this->id + ); foreach ($result as $categ_to_delete) $this->deleteCategory($categ_to_delete['id_category']); // if none are found, it's an error @@ -809,12 +800,8 @@ class ProductCore extends ObjectModel WHERE `id_product` = '.(int)$this->id.' AND id_category = '.(int)$id_category.'' ); - $return = Db::getInstance()->execute( - 'DELETE FROM `'._DB_PREFIX_.'category_product` - WHERE `id_product` = '.(int)$this->id.' - AND id_category = '.(int)$id_category.'' - ); + $return = Db::getInstance()->delete('category_product', 'id_product = '.(int)$this->id.' AND id_category = '.(int)$id_category); if ($clean_positions === true) foreach ($result as $row) $this->cleanPositions((int)$row['id_category']); @@ -829,11 +816,7 @@ class ProductCore extends ObjectModel */ public function deleteCategories($clean_positions = false) { - $return = Db::getInstance()->execute( - 'DELETE FROM `'._DB_PREFIX_.'category_product` - WHERE `id_product` = '.(int)$this->id - ); - + $return = Db::getInstance()->delete('category_product', 'id_product = '.(int)$this->id); if ($clean_positions === true) { $result = Db::getInstance()->executeS( @@ -855,18 +838,8 @@ class ProductCore extends ObjectModel */ public function deleteTags() { - return ( - Db::getInstance()->execute( - 'DELETE FROM `'._DB_PREFIX_.'product_tag` - WHERE `id_product` = '.(int)$this->id - ) - && - Db::getInstance()->execute( - 'DELETE FROM `'._DB_PREFIX_.'tag` - WHERE `id_tag` NOT IN (SELECT `id_tag` - FROM `'._DB_PREFIX_.'product_tag`)' - ) - ); + return Db::getInstance()->delete('product_tag', 'id_product = '.(int)$this->id) + && Db::getInstance()->delete('tag', 'id_tag NOT IN (SELECT id_tag FROM '._DB_PREFIX_.'product_tag)'); } /** @@ -876,10 +849,7 @@ class ProductCore extends ObjectModel */ public function deleteCartProducts() { - return Db::getInstance()->execute( - 'DELETE FROM `'._DB_PREFIX_.'cart_product` - WHERE `id_product` = '.(int)$this->id - ); + return Db::getInstance()->delete('cart_product', 'id_product` = '.(int)$this->id); } /** @@ -908,9 +878,10 @@ class ProductCore extends ObjectModel public static function getProductAttributePrice($id_product_attribute) { $rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' - SELECT `price` - FROM `'._DB_PREFIX_.'product_attribute` - WHERE `id_product_attribute` = '.(int)$id_product_attribute); + SELECT `price` + FROM `'._DB_PREFIX_.'product_attribute` + WHERE `id_product_attribute` = '.(int)$id_product_attribute + ); return $rq['price']; } @@ -1205,23 +1176,22 @@ class ProductCore extends ObjectModel */ public function deleteDefaultAttributes() { - return Db::getInstance()->execute(' - UPDATE `'._DB_PREFIX_.'product_attribute` - SET `default_on` = 0 - WHERE `id_product` = '.(int)$this->id); + return Db::getInstance()->update('product_attribute', array( + 'default_on' => 0, + ), 'id_product = '.(int)$this->id); } public function setDefaultAttribute($id_product_attribute) { - return Db::getInstance()->execute(' - UPDATE `'._DB_PREFIX_.'product_attribute` - SET `default_on` = 1 - WHERE `id_product` = '.(int)$this->id.' - AND `id_product_attribute` = '.(int)$id_product_attribute) && - Db::getInstance()->execute(' - UPDATE `'._DB_PREFIX_.'product` - SET `cache_default_attribute` = '.(int)$id_product_attribute.' - WHERE `id_product` = '.(int)$this->id.' LIMIT 1'); + $result = Db::getInstance()->update('product_attribute', array( + 'default_on' => 1 + ), 'id_product` = '.(int)$this->id.' AND `id_product_attribute` = '.(int)$id_product_attribute); + + $result &= Db::getInstance()->update('product', array( + 'cache_default_attribute' => (int)$id_product_attribute, + ), 'id_product = '.(int)$this->id); + + return $result; } /** @@ -1518,18 +1488,16 @@ class ProductCore extends ObjectModel public function addAttributeCombinationMultiple($id_attributes, $combinations) { - $attributes_list = ''; + $attributes_list = array(); foreach ($id_attributes as $nb => $id_product_attribute) if (isset($combinations[$nb])) foreach ($combinations[$nb] as $id_attribute) - $attributes_list .= '('.(int)$id_product_attribute.','.(int)$id_attribute.'),'; + $attributes_list[] = array( + 'id_product_attribute' => (int)$id_product_attribute, + 'id_attribute' => (int)$id_attribute, + ); - $attributes_list = rtrim($attributes_list, ','); - - return Db::getInstance()->execute( - 'INSERT INTO `'._DB_PREFIX_.'product_attribute_combination` (`id_product_attribute`, `id_attribute`) - VALUES '.$attributes_list - ); + return Db::getInstance()->insert('product_attribute_combination', $attributes_list); } /** @@ -3275,11 +3243,15 @@ class ProductCore extends ObjectModel $tags = Db::getInstance()->executeS('SELECT `id_tag` FROM `'._DB_PREFIX_.'product_tag` WHERE `id_product` = '.(int)$id_product_old); if (!Db::getInstance()->NumRows()) return true; - $query = 'INSERT INTO `'._DB_PREFIX_.'product_tag` (`id_product`, `id_tag`) VALUES'; + + $data = array(); foreach ($tags as $tag) - $query .= ' ('.(int)$id_product_new.', '.(int)$tag['id_tag'].'),'; - $query = rtrim($query, ','); - return Db::getInstance()->execute($query); + $data[] = array( + 'id_product' => (int)$id_product_new, + 'id_tag' => (int)$tag['id_tag'], + ); + + return Db::getInstance()->insert('product_tag', $data); } public static function duplicateDownload($id_product_old, $id_product_new) @@ -3291,18 +3263,19 @@ class ProductCore extends ObjectModel if (!$results) return true; - $query = 'INSERT INTO `'._DB_PREFIX_.'product_download` - (`id_product`, `display_filename`, `filename`, `date_add`, `date_expiration`, `nb_days_accessible`, `nb_downloadable`, `active`, `is_shareable`) - VALUES'; - + $data = array(); foreach ($results as $row) - $query .= ' ('.(int)$id_product_new.', \''.pSQL($row['display_filename']).'\', \''.pSQL($row['filename']). - '\', \''.pSQL($row['date_add']).'\', \''.pSQL($row['date_expiration']).'\', '.(int)$row['nb_days_accessible']. - ', '.(int)$row['nb_downloadable'].', '.(int)$row['active'].'), '.(int)$row['is_shareable'].'),'; - - $query = rtrim($query, ','); - - return Db::getInstance()->execute($query); + $data[] = array( + 'id_product' => (int)$id_product_new, + 'display_filename' => pSQL($row['display_filename']), + 'filename' => pSQL($row['filename']), + 'date_expiration' => pSQL($row['date_expiration']), + 'nb_days_accessible' => (int)$row['nb_days_accessible'], + 'nb_downloadable' => (int)$row['nb_downloadable'], + 'active' => (int)$row['active'], + 'is_shareable' => (int)$row['is_shareable'] + ); + return Db::getInstance()->insert('product_download', $data); } /** @@ -3421,12 +3394,16 @@ class ProductCore extends ObjectModel if (isset($customizations['labels'])) { - $query = 'INSERT INTO `'._DB_PREFIX_.'customization_field_lang` (`id_customization_field`, `id_lang`, `name`) VALUES '; + $query = 'INSERT INTO `'._DB_PREFIX_.'` (`id_customization_field`, `id_lang`, `name`) VALUES '; + $data = array(); foreach ($customizations['labels'][$old_customization_field_id] as $customization_label) - $query .= '('.(int)$customization_field_id.', '.(int)$customization_label['id_lang'].', \''.pSQL($customization_label['name']).'\'), '; + $data = array( + 'id_customization_field' => (int)$customization_field_id, + 'id_lang' => (int)$customization_label['id_lang'], + 'name' => pSQL($customization_label['name']), + ); - $query = rtrim($query, ', '); - if (!Db::getInstance()->execute($query)) + if (!Db::getInstance()->insert('customization_field_lang', $data)) return false; } } diff --git a/classes/Search.php b/classes/Search.php index 339e51c3d..ad1069280 100644 --- a/classes/Search.php +++ b/classes/Search.php @@ -401,9 +401,9 @@ class SearchCore if ($full) { - $db->Execute('TRUNCATE '._DB_PREFIX_.'search_index'); - $db->Execute('TRUNCATE '._DB_PREFIX_.'search_word'); - $db->Execute('UPDATE '._DB_PREFIX_.'product SET indexed = 0'); + $db->execute('TRUNCATE '._DB_PREFIX_.'search_index'); + $db->execute('TRUNCATE '._DB_PREFIX_.'search_word'); + $db->execute('UPDATE '._DB_PREFIX_.'product SET indexed = 0'); } else { @@ -420,7 +420,7 @@ class SearchCore foreach ($products as $product) $ids[] = (int)$product['id_product']; if (count($ids)) - $db->Execute('DELETE FROM '._DB_PREFIX_.'search_index WHERE id_product IN ('.implode(',', $ids).')'); + $db->execute('DELETE FROM '._DB_PREFIX_.'search_index WHERE id_product IN ('.implode(',', $ids).')'); } // Every fields are weighted according to the configuration in the backend @@ -516,7 +516,7 @@ class SearchCore if (count($queryArray)) { // The words are inserted... - $db->Execute(' + $db->execute(' INSERT IGNORE INTO '._DB_PREFIX_.'search_word (id_lang, id_shop, word) VALUES '.implode(',', $queryArray)); } diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php index b73881933..94c8a2b8e 100644 --- a/classes/SpecificPrice.php +++ b/classes/SpecificPrice.php @@ -142,7 +142,7 @@ class SpecificPriceCore extends ObjectModel public static function deleteByIdCart($id_cart, $id_product = false, $id_product_attribute = false) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'specific_price` WHERE id_cart='.(int)$id_cart. ($id_product ? ' AND id_product='.(int)$id_product.' AND id_product_attribute='.(int)$id_product_attribute : '')); diff --git a/classes/order/Order.php b/classes/order/Order.php index eb30e4083..e22d639b7 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -1395,7 +1395,7 @@ class OrderCore extends ObjectModel */ public function getShipping() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT DISTINCT oc.`id_order_invoice`, oc.`weight`, oc.`shipping_cost_tax_excl`, oc.`shipping_cost_tax_incl`, c.`url`, oc.`id_carrier`, c.`name` as `state_name`, oc.`date_add`, "Delivery" as `type`, "true" as `can_edit`, oc.`tracking_number`, oc.`id_order_carrier` FROM `'._DB_PREFIX_.'orders` o LEFT JOIN `'._DB_PREFIX_.'order_history` oh diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php index 71934fd1c..3dffa2cf7 100644 --- a/classes/order/OrderInvoice.php +++ b/classes/order/OrderInvoice.php @@ -361,7 +361,7 @@ class OrderInvoiceCore extends ObjectModel */ public static function getByDateInterval($date_from, $date_to) { - $order_invoice_list = Db::getInstance()->ExecuteS(' + $order_invoice_list = Db::getInstance()->executeS(' SELECT oi.* FROM `'._DB_PREFIX_.'order_invoice` oi LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`) @@ -409,7 +409,7 @@ class OrderInvoiceCore extends ObjectModel */ public static function getByDeliveryDateInterval($date_from, $date_to) { - $order_invoice_list = Db::getInstance()->ExecuteS(' + $order_invoice_list = Db::getInstance()->executeS(' SELECT oi.* FROM `'._DB_PREFIX_.'order_invoice` oi LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`) diff --git a/classes/order/OrderPayment.php b/classes/order/OrderPayment.php index 7099a5aea..55d7529ea 100644 --- a/classes/order/OrderPayment.php +++ b/classes/order/OrderPayment.php @@ -79,7 +79,7 @@ class OrderPaymentCore extends ObjectModel */ public static function getByOrderId($id_order) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'order_payment` WHERE `id_order` = '.(int)$id_order); diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index d9fd8064d..ee6cf329f 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -81,10 +81,10 @@ class AdminCartRulesControllerCore extends AdminController // All the associations are deleted for an update, then recreated when we call the "afterAdd" method $id_cart_rule = Tools::getValue('id_cart_rule'); foreach (array('country', 'carrier', 'group', 'product_rule_group', 'shop') as $type) - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_'.$type.'` WHERE `id_cart_rule` = '.(int)$id_cart_rule); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_product_rule_group` NOT IN (SELECT `id_product_rule_group` FROM `'._DB_PREFIX_.'cart_rule_product_rule_group`)'); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)'); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$id_cart_rule.' OR `id_cart_rule_2` = '.(int)$id_cart_rule); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_'.$type.'` WHERE `id_cart_rule` = '.(int)$id_cart_rule); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_product_rule_group` NOT IN (SELECT `id_product_rule_group` FROM `'._DB_PREFIX_.'cart_rule_product_rule_group`)'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$id_cart_rule.' OR `id_cart_rule_2` = '.(int)$id_cart_rule); $this->afterAdd($current_object); } @@ -99,7 +99,7 @@ class AdminCartRulesControllerCore extends AdminController $values = array(); foreach ($array as $id) $values[] = '('.(int)$currentObject->id.','.(int)$id.')'; - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_'.$type.'` (`id_cart_rule`, `id_'.$type.'`) VALUES '.implode(',', $values)); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_'.$type.'` (`id_cart_rule`, `id_'.$type.'`) VALUES '.implode(',', $values)); } // Add cart rule restrictions if (Tools::getValue('cart_rule_restriction') && is_array($array = Tools::getValue('cart_rule_select')) && count($array)) @@ -107,28 +107,28 @@ class AdminCartRulesControllerCore extends AdminController $values = array(); foreach ($array as $id) $values[] = '('.(int)$currentObject->id.','.(int)$id.')'; - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`) VALUES '.implode(',', $values)); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`) VALUES '.implode(',', $values)); } // Add product rule restrictions if (Tools::getValue('product_restriction') && is_array($ruleGroupArray = Tools::getValue('product_rule_group')) && count($ruleGroupArray)) { foreach ($ruleGroupArray as $ruleGroupId) { - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_group` (`id_cart_rule`, `quantity`) + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_group` (`id_cart_rule`, `quantity`) VALUES ('.(int)$currentObject->id.', '.(int)Tools::getValue('product_rule_group_'.$ruleGroupId.'_quantity').')'); $id_product_rule_group = Db::getInstance()->Insert_ID(); if (is_array($ruleArray = Tools::getValue('product_rule_'.$ruleGroupId)) && count($ruleArray)) foreach ($ruleArray as $ruleId) { - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule` (`id_product_rule_group`, `type`) + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule` (`id_product_rule_group`, `type`) VALUES ('.(int)$id_product_rule_group.', "'.pSQL(Tools::getValue('product_rule_'.$ruleGroupId.'_'.$ruleId.'_type')).'")'); $id_product_rule = Db::getInstance()->Insert_ID(); $values = array(); foreach (Tools::getValue('product_rule_select_'.$ruleGroupId.'_'.$ruleId) as $id) $values[] = '('.(int)$id_product_rule.','.(int)$id.')'; - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_value` (`id_product_rule`, `id_item`) VALUES '.implode(',', $values)); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_value` (`id_product_rule`, `id_item`) VALUES '.implode(',', $values)); } } } @@ -136,7 +136,7 @@ class AdminCartRulesControllerCore extends AdminController // If the new rule has no cart rule restriction, then it must be added to the white list of the other cart rules that have restrictions if ($currentObject->cart_rule_restriction == 0) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`) ( SELECT id_cart_rule, '.(int)$currentObject->id.' FROM `'._DB_PREFIX_.'cart_rule` WHERE cart_rule_restriction = 1 )'); @@ -144,7 +144,7 @@ class AdminCartRulesControllerCore extends AdminController // And if the new cart rule has restrictions, previously unrestricted cart rules may now be restricted (a mug of coffee is strongly advised to understand this sentence) else { - $ruleCombinations = Db::getInstance()->ExecuteS(' + $ruleCombinations = Db::getInstance()->executeS(' SELECT cr.id_cart_rule FROM '._DB_PREFIX_.'cart_rule cr WHERE cr.id_cart_rule != '.(int)$currentObject->id.' @@ -156,8 +156,8 @@ class AdminCartRulesControllerCore extends AdminController )'); foreach ($ruleCombinations as $incompatibleRule) { - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'cart_rule` SET cart_rule_restriction = 1 WHERE id_cart_rule = '.(int)$incompatibleRule['id_cart_rule'].' LIMIT 1'); - Db::getInstance()->Execute(' + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'cart_rule` SET cart_rule_restriction = 1 WHERE id_cart_rule = '.(int)$incompatibleRule['id_cart_rule'].' LIMIT 1'); + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`) ( SELECT id_cart_rule, '.(int)$incompatibleRule['id_cart_rule'].' FROM `'._DB_PREFIX_.'cart_rule` WHERE active = 1 AND id_cart_rule != '.(int)$currentObject->id.' )'); @@ -233,7 +233,7 @@ class AdminCartRulesControllerCore extends AdminController { case 'attributes': $attributes = array('selected' => array(), 'unselected' => array()); - $results = Db::getInstance()->ExecuteS(' + $results = Db::getInstance()->executeS(' SELECT CONCAT(agl.name, " - ", al.name) as name, a.id_attribute as id FROM '._DB_PREFIX_.'attribute_group_lang agl LEFT JOIN '._DB_PREFIX_.'attribute a ON a.id_attribute_group = agl.id_attribute_group @@ -249,7 +249,7 @@ class AdminCartRulesControllerCore extends AdminController case 'products': // Todo: Consider optimization $products = array('selected' => array(), 'unselected' => array()); - $results = Db::getInstance()->ExecuteS(' + $results = Db::getInstance()->executeS(' SELECT name, id_product as id FROM '._DB_PREFIX_.'product_lang pl WHERE id_lang = '.(int)Context::getContext()->language->id.' @@ -262,7 +262,7 @@ class AdminCartRulesControllerCore extends AdminController break; case 'manufacturers': $products = array('selected' => array(), 'unselected' => array()); - $results = Db::getInstance()->ExecuteS(' + $results = Db::getInstance()->executeS(' SELECT name, id_manufacturer as id FROM '._DB_PREFIX_.'manufacturer ORDER BY name'); @@ -274,7 +274,7 @@ class AdminCartRulesControllerCore extends AdminController break; case 'suppliers': $products = array('selected' => array(), 'unselected' => array()); - $results = Db::getInstance()->ExecuteS(' + $results = Db::getInstance()->executeS(' SELECT name, id_supplier as id FROM '._DB_PREFIX_.'supplier ORDER BY name'); @@ -287,7 +287,7 @@ class AdminCartRulesControllerCore extends AdminController case 'categories': // Todo: Consider optimization $categories = array('selected' => array(), 'unselected' => array()); - $results = Db::getInstance()->ExecuteS(' + $results = Db::getInstance()->executeS(' SELECT name, id_category as id FROM '._DB_PREFIX_.'category_lang pl WHERE id_lang = '.(int)Context::getContext()->language->id.' @@ -313,7 +313,7 @@ class AdminCartRulesControllerCore extends AdminController if (Tools::isSubmit('customerFilter')) { $q = trim(Tools::getValue('q')); - $customers = Db::getInstance()->ExecuteS(' + $customers = Db::getInstance()->executeS(' SELECT `id_customer`, `email`, CONCAT(`firstname`, \' \', `lastname`) as cname FROM `'._DB_PREFIX_.'customer` WHERE `deleted` = 0 AND is_guest = 0 AND active = 1 diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 88a7db2a5..9c9e5297c 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1293,7 +1293,7 @@ class AdminProductsControllerCore extends AdminController // if deleted image was the cover, change it to the first one if (!Image::getCover($image->id_product)) { - $res &= Db::getInstance()->Execute(' + $res &= Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'image` SET `cover` = 1 WHERE `id_product` = '.(int)$image->id_product.' LIMIT 1'); diff --git a/install-dev/upgrade/php/add_required_customization_field_flag.php b/install-dev/upgrade/php/add_required_customization_field_flag.php index b4dedb3e4..c0b178fd6 100644 --- a/install-dev/upgrade/php/add_required_customization_field_flag.php +++ b/install-dev/upgrade/php/add_required_customization_field_flag.php @@ -29,14 +29,14 @@ define('_CONTAINS_REQUIRED_FIELD_', 2); function add_required_customization_field_flag() { - if (($result = Db::getInstance()->ExecuteS('SELECT `id_product` FROM `'._DB_PREFIX_.'customization_field` WHERE `required` = 1')) === false) + if (($result = Db::getInstance()->executeS('SELECT `id_product` FROM `'._DB_PREFIX_.'customization_field` WHERE `required` = 1')) === false) return false; if (Db::getInstance()->numRows()) { $productIds = array(); foreach ($result AS $row) $productIds[] = (int)($row['id_product']); - if (!Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'product` SET `customizable` = '._CONTAINS_REQUIRED_FIELD_.' WHERE `id_product` IN ('.implode(', ', $productIds).')')) + if (!Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'product` SET `customizable` = '._CONTAINS_REQUIRED_FIELD_.' WHERE `id_product` IN ('.implode(', ', $productIds).')')) return false; } return true; diff --git a/install-dev/upgrade/php/alter_blocklink.php b/install-dev/upgrade/php/alter_blocklink.php index b3157e0f6..e70876477 100644 --- a/install-dev/upgrade/php/alter_blocklink.php +++ b/install-dev/upgrade/php/alter_blocklink.php @@ -28,9 +28,9 @@ function alter_blocklink() { // No one will know if the table does not exist :] Thanks Damien for your solution ;) - DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'blocklink_lang` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL'); + DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'blocklink_lang` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL'); - DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'blocklink` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL'); + DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'blocklink` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL'); } diff --git a/install-dev/upgrade/php/alter_cms_block.php b/install-dev/upgrade/php/alter_cms_block.php index f2249b504..3ffadc179 100644 --- a/install-dev/upgrade/php/alter_cms_block.php +++ b/install-dev/upgrade/php/alter_cms_block.php @@ -28,13 +28,13 @@ function alter_cms_block() { // No one will know if the table does not exist :] Thanks Damien for your solution ;) - DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_lang` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL'); + DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_lang` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL'); - DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL'); + DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL'); - DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL'); + DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL'); - DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms_page` `id_cms_block_page` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT'); + DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms_page` `id_cms_block_page` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT'); } diff --git a/install-dev/upgrade/php/alter_productcomments_guest_index.php b/install-dev/upgrade/php/alter_productcomments_guest_index.php index c25b51546..aad51e52a 100644 --- a/install-dev/upgrade/php/alter_productcomments_guest_index.php +++ b/install-dev/upgrade/php/alter_productcomments_guest_index.php @@ -33,7 +33,7 @@ function alter_productcomments_guest_index() if (!$id_productcomments) return; - DB::getInstance()->Execute(' + DB::getInstance()->execute(' ALTER TABLE `'._DB_PREFIX_.'product_comment` DROP INDEX `id_guest`, ADD INDEX `id_guest` (`id_guest`);'); } diff --git a/install-dev/upgrade/php/attribute_group_clean_combinations.php b/install-dev/upgrade/php/attribute_group_clean_combinations.php index f9cf2f92f..dcd95a48b 100644 --- a/install-dev/upgrade/php/attribute_group_clean_combinations.php +++ b/install-dev/upgrade/php/attribute_group_clean_combinations.php @@ -27,7 +27,7 @@ function attribute_group_clean_combinations() { - $attributeCombinations = Db::getInstance()->ExecuteS('SELECT + $attributeCombinations = Db::getInstance()->executeS('SELECT pac.`id_attribute`, pa.`id_product_attribute` FROM `'._DB_PREFIX_.'product_attribute` pa LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac @@ -39,7 +39,7 @@ function attribute_group_clean_combinations() if (!empty($toRemove)) { - $res = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_attribute` + $res = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product_attribute` IN ('.implode(', ', $toRemove).')'); return $res; } diff --git a/install-dev/upgrade/php/blocknewsletter.php b/install-dev/upgrade/php/blocknewsletter.php index e523832a8..23effb77f 100644 --- a/install-dev/upgrade/php/blocknewsletter.php +++ b/install-dev/upgrade/php/blocknewsletter.php @@ -28,6 +28,6 @@ function blocknewsletter() { // No one will know if the table does not exist :] - DB::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'newsletter ADD `http_referer` VARCHAR(255) NULL'); + DB::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'newsletter ADD `http_referer` VARCHAR(255) NULL'); } diff --git a/install-dev/upgrade/php/configuration_double_cleaner.php b/install-dev/upgrade/php/configuration_double_cleaner.php index 727576b6a..f0638aa02 100644 --- a/install-dev/upgrade/php/configuration_double_cleaner.php +++ b/install-dev/upgrade/php/configuration_double_cleaner.php @@ -27,19 +27,19 @@ function configuration_double_cleaner() { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT name, MIN(id_configuration) AS minid FROM '._DB_PREFIX_.'configuration GROUP BY name HAVING count(name) > 1'); foreach ($result as $row) { - DB::getInstance()->Execute(' + DB::getInstance()->execute(' DELETE FROM '._DB_PREFIX_.'configuration WHERE name = \''.addslashes($row['name']).'\' AND id_configuration != '.(int)($row['minid'])); } - DB::getInstance()->Execute(' + DB::getInstance()->execute(' DELETE FROM '._DB_PREFIX_.'configuration_lang WHERE id_configuration NOT IN ( SELECT id_configuration diff --git a/install-dev/upgrade/php/delivery_number_set.php b/install-dev/upgrade/php/delivery_number_set.php index 7690bc57e..babff4a89 100644 --- a/install-dev/upgrade/php/delivery_number_set.php +++ b/install-dev/upgrade/php/delivery_number_set.php @@ -31,7 +31,7 @@ function delivery_number_set() $number = 1; // Update each order with a number - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT id_order FROM '._DB_PREFIX_.'orders ORDER BY id_order'); @@ -44,7 +44,7 @@ function delivery_number_set() $oS = new OrderState((int)($row2['id_order_state']), Configuration::get('PS_LANG_DEFAULT')); if ($oS->delivery) { - Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'orders SET delivery_number = '.(int)($number++).', `delivery_date` = `date_add` WHERE id_order = '.(int)($order->id)); + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'orders SET delivery_number = '.(int)($number++).', `delivery_date` = `date_add` WHERE id_order = '.(int)($order->id)); break ; } } diff --git a/install-dev/upgrade/php/generate_ntree.php b/install-dev/upgrade/php/generate_ntree.php index b1822350c..f42bcb481 100644 --- a/install-dev/upgrade/php/generate_ntree.php +++ b/install-dev/upgrade/php/generate_ntree.php @@ -27,7 +27,7 @@ function generate_ntree() { - $categories = Db::getInstance()->ExecuteS('SELECT id_category, id_parent FROM '._DB_PREFIX_.'category ORDER BY id_parent ASC, position ASC'); + $categories = Db::getInstance()->executeS('SELECT id_category, id_parent FROM '._DB_PREFIX_.'category ORDER BY id_parent ASC, position ASC'); $categoriesArray = array(); foreach ($categories AS $category) $categoriesArray[(int)$category['id_parent']]['subcategories'][(int)$category['id_category']] = 1; @@ -43,7 +43,7 @@ function generate_ntree_subTree(&$categories, $id_category, &$n) generate_ntree_subTree($categories, (int)$id_subcategory, $n); $right = (int)$n++; - Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'category + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'category SET nleft = '.(int)$left.', nright = '.(int)$right.' WHERE id_category = '.(int)$id_category.' LIMIT 1'); } diff --git a/install-dev/upgrade/php/generate_tax_rules.php b/install-dev/upgrade/php/generate_tax_rules.php index d80305e94..4091f21c4 100644 --- a/install-dev/upgrade/php/generate_tax_rules.php +++ b/install-dev/upgrade/php/generate_tax_rules.php @@ -44,7 +44,7 @@ function generate_tax_rules() $id_tax_rules_group = Db::getInstance()->insert_id; - $countries = Db::getInstance()->ExecuteS(' + $countries = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'country` c LEFT JOIN `'._DB_PREFIX_.'zone` z ON (c.`id_zone` = z.`id_zone`) LEFT JOIN `'._DB_PREFIX_.'tax_zone` tz ON (tz.`id_zone` = z.`id_zone`) @@ -54,7 +54,7 @@ function generate_tax_rules() { foreach ($countries AS $country) { - $res = Db::getInstance()->Execute(' + $res = Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'tax_rule` (`id_tax_rules_group`, `id_country`, `id_state`, `state_behavior`, `id_tax`) VALUES ( '.(int)$id_tax_rules_group.', @@ -67,7 +67,7 @@ function generate_tax_rules() } } - $states = Db::getInstance()->ExecuteS(' + $states = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'states s LEFT JOIN `'._DB_PREFIX_.'tax_state ts ON (ts.`id_state` = s.`id_state`) WHERE `id_tax` = '.(int)$id_tax diff --git a/install-dev/upgrade/php/hook_blocksearch_on_header.php b/install-dev/upgrade/php/hook_blocksearch_on_header.php index 135934395..ea5a425b1 100644 --- a/install-dev/upgrade/php/hook_blocksearch_on_header.php +++ b/install-dev/upgrade/php/hook_blocksearch_on_header.php @@ -41,7 +41,7 @@ function hook_blocksearch_on_header() WHERE `id_hook` = '.(int)$id_hook.' '); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_hook`, `position`) VALUES ('.(int)$id_module.', '.(int)$id_hook.', '.($position+1).') '); diff --git a/install-dev/upgrade/php/invoice_number_set.php b/install-dev/upgrade/php/invoice_number_set.php index 1d5949058..8ac556df8 100644 --- a/install-dev/upgrade/php/invoice_number_set.php +++ b/install-dev/upgrade/php/invoice_number_set.php @@ -31,7 +31,7 @@ function invoice_number_set() $number = 1; // Update each order with a number - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT id_order FROM '._DB_PREFIX_.'orders ORDER BY id_order'); @@ -44,7 +44,7 @@ function invoice_number_set() $oS = new OrderState((int)($row2['id_order_state']), Configuration::get('PS_LANG_DEFAULT')); if ($oS->invoice) { - Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'orders SET invoice_number = '.(int)($number++).', `invoice_date` = `date_add` WHERE id_order = '.(int)($order->id)); + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'orders SET invoice_number = '.(int)($number++).', `invoice_date` = `date_add` WHERE id_order = '.(int)($order->id)); break ; } } diff --git a/install-dev/upgrade/php/latin1_database_to_utf8.php b/install-dev/upgrade/php/latin1_database_to_utf8.php index fdcfd4c0f..ebcbfe7c8 100644 --- a/install-dev/upgrade/php/latin1_database_to_utf8.php +++ b/install-dev/upgrade/php/latin1_database_to_utf8.php @@ -88,7 +88,7 @@ function latin1_database_to_utf8() foreach ($tables AS $table) { /* Latin1 datas' selection */ - if (!Db::getInstance()->Execute('SET NAMES latin1')) + if (!Db::getInstance()->execute('SET NAMES latin1')) echo 'Cannot change the sql encoding to latin1!'; $query = 'SELECT `'.$table['id'].'`'; foreach ($table['fields'] AS $field) @@ -96,7 +96,7 @@ function latin1_database_to_utf8() if (isset($table['lang']) AND $table['lang']) $query .= ', `id_lang`'; $query .= ' FROM `'._DB_PREFIX_.$table['name'].'`'; - $latin1Datas = Db::getInstance()->ExecuteS($query); + $latin1Datas = Db::getInstance()->executeS($query); if ($latin1Datas === false) { $warningExist = true; @@ -111,7 +111,7 @@ function latin1_database_to_utf8() if (Db::getInstance()->NumRows()) { /* Utf-8 datas' restitution */ - if (!Db::getInstance()->Execute('SET NAMES utf8')) + if (!Db::getInstance()->execute('SET NAMES utf8')) echo 'Cannot change the sql encoding to utf8!'; foreach ($latin1Datas AS $latin1Data) { @@ -122,7 +122,7 @@ function latin1_database_to_utf8() $query .= ' WHERE `'.$table['id'].'` = '.(int)($latin1Data[$table['id']]); if (isset($table['lang']) AND $table['lang']) $query .= ' AND `id_lang` = '.(int)($latin1Data['id_lang']); - if (!Db::getInstance()->Execute($query)) + if (!Db::getInstance()->execute($query)) { $warningExist = true; $requests .= ' diff --git a/install-dev/upgrade/php/migrate_block_info_to_cms_block.php b/install-dev/upgrade/php/migrate_block_info_to_cms_block.php index 6f4c980f3..0a046c81f 100644 --- a/install-dev/upgrade/php/migrate_block_info_to_cms_block.php +++ b/install-dev/upgrade/php/migrate_block_info_to_cms_block.php @@ -60,7 +60,7 @@ function migrate_block_info_to_cms_block() } // module install - $res &= Db::getInstance()->Execute(' + $res &= Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cms_block`( `id_cms_block` int(10) unsigned NOT NULL auto_increment, `id_cms_category` int(10) unsigned NOT NULL, @@ -69,9 +69,9 @@ function migrate_block_info_to_cms_block() `display_store` tinyint(1) unsigned NOT NULL default \'1\', PRIMARY KEY (`id_cms_block`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8'); - $res &= Db::getInstance()->Execute(' + $res &= Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cms_block` (`id_cms_category`, `location`, `position`) VALUES(1, 0, 0)'); - $res &= Db::getInstance()->Execute(' + $res &= Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cms_block_lang`( `id_cms_block` int(10) unsigned NOT NULL, `id_lang` int(10) unsigned NOT NULL, @@ -83,9 +83,9 @@ function migrate_block_info_to_cms_block() foreach ($languages AS $language) $query_lang .= '(1, '.(int)($language['id_lang']).'),'; $query_lang = rtrim($query_lang, ','); - $res &= Db::getInstance()->Execute($query_lang); + $res &= Db::getInstance()->execute($query_lang); - $res &= Db::getInstance()->Execute(' + $res &= Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cms_block_page`( `id_cms_block_page` int(10) unsigned NOT NULL auto_increment, `id_cms_block` int(10) unsigned NOT NULL, diff --git a/install-dev/upgrade/php/reorderpositions.php b/install-dev/upgrade/php/reorderpositions.php index 964d4402e..29a947748 100644 --- a/install-dev/upgrade/php/reorderpositions.php +++ b/install-dev/upgrade/php/reorderpositions.php @@ -101,7 +101,7 @@ function reorderpositions() SET `position` = '.(int)$i.' WHERE `id_parent` = '.(int)$id_category_parent.' AND `id_cms_category` = '.(int)$result[$i]['id_cms_category']; - $res &= Db::getInstance()->Execute($sql); + $res &= Db::getInstance()->execute($sql); } } } \ No newline at end of file diff --git a/install-dev/upgrade/php/set_discount_category.php b/install-dev/upgrade/php/set_discount_category.php index 36fc490f0..188f70605 100644 --- a/install-dev/upgrade/php/set_discount_category.php +++ b/install-dev/upgrade/php/set_discount_category.php @@ -27,9 +27,9 @@ function set_discount_category() { - $discounts = Db::getInstance()->ExecuteS('SELECT `id_discount` FROM `'._DB_PREFIX_.'discount`'); - $categories = Db::getInstance()->ExecuteS('SELECT `id_category` FROM `'._DB_PREFIX_.'category`'); + $discounts = Db::getInstance()->executeS('SELECT `id_discount` FROM `'._DB_PREFIX_.'discount`'); + $categories = Db::getInstance()->executeS('SELECT `id_category` FROM `'._DB_PREFIX_.'category`'); foreach ($discounts AS $discount) foreach ($categories AS $category) - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'discount_category` (`id_discount`,`id_category`) VALUES ('.(int)($discount['id_discount']).','.(int)($category['id_category']).')'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'discount_category` (`id_discount`,`id_category`) VALUES ('.(int)($discount['id_discount']).','.(int)($category['id_category']).')'); } diff --git a/install-dev/upgrade/php/set_payment_module.php b/install-dev/upgrade/php/set_payment_module.php index a66c2cb79..a8e3a850d 100644 --- a/install-dev/upgrade/php/set_payment_module.php +++ b/install-dev/upgrade/php/set_payment_module.php @@ -40,10 +40,10 @@ function set_payment_module() $content = fread($fd, filesize($file)); if (preg_match_all('/extends PaymentModule/U', $content, $matches)) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'module_country` (id_module, id_country) SELECT '.(int)($module['id_module']).', id_country FROM `'._DB_PREFIX_.'country` WHERE active = 1'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'module_currency` (id_module, id_currency) SELECT '.(int)($module['id_module']).', id_currency FROM `'._DB_PREFIX_.'currency` WHERE deleted = 0'); } diff --git a/install-dev/upgrade/php/set_payment_module_group.php b/install-dev/upgrade/php/set_payment_module_group.php index cc5bfb556..6bd7bc9b5 100644 --- a/install-dev/upgrade/php/set_payment_module_group.php +++ b/install-dev/upgrade/php/set_payment_module_group.php @@ -40,7 +40,7 @@ function set_payment_module_group() $content = fread($fd, filesize($file)); if (preg_match_all('/extends PaymentModule/U', $content, $matches)) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'module_group` (id_module, id_group) SELECT '.(int)($module['id_module']).', id_group FROM `'._DB_PREFIX_.'group`'); } diff --git a/install-dev/upgrade/php/update_carrier_url.php b/install-dev/upgrade/php/update_carrier_url.php index d81a12867..58d40d0e8 100644 --- a/install-dev/upgrade/php/update_carrier_url.php +++ b/install-dev/upgrade/php/update_carrier_url.php @@ -36,7 +36,7 @@ function update_carrier_url() // Check each one and erase carrier URL if not correct URL foreach ($carriers as $carrier) if (empty($carrier['url']) || !preg_match('/^https?:\/\/[:#%&_=\(\)\.\? \+\-@\/a-zA-Z0-9]+$/', $carrier['url'])) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'carrier` SET `url` = \'\' WHERE `id_carrier`= '.(int)($carrier['id_carrier'])); diff --git a/install-dev/upgrade/php/update_module_followup.php b/install-dev/upgrade/php/update_module_followup.php index c68825a29..5a5607510 100644 --- a/install-dev/upgrade/php/update_module_followup.php +++ b/install-dev/upgrade/php/update_module_followup.php @@ -31,6 +31,6 @@ function update_module_followup() if (!$id_followup) return; - Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'log_email` ADD INDEX `date_add`(`date_add`), ADD INDEX `id_cart`(`id_cart`);'); + Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'log_email` ADD INDEX `date_add`(`date_add`), ADD INDEX `id_cart`(`id_cart`);'); } diff --git a/install-dev/upgrade/php/update_modules_sql.php b/install-dev/upgrade/php/update_modules_sql.php index 0f7a3bfb0..522d77467 100644 --- a/install-dev/upgrade/php/update_modules_sql.php +++ b/install-dev/upgrade/php/update_modules_sql.php @@ -29,12 +29,12 @@ function update_modules_sql() { $id_blocklink = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name = "blocklink"'); if ($id_blocklink) - Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'blocklink_lang` ADD PRIMARY KEY (`id_link`, `id_lang`);'); + Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'blocklink_lang` ADD PRIMARY KEY (`id_link`, `id_lang`);'); $id_productcomments = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name = "productcomments"'); if ($id_productcomments) { - Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_grade` ADD PRIMARY KEY (`id_product_comment`, `id_product_comment_criterion`);'); - Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion` DROP PRIMARY KEY, ADD PRIMARY KEY (`id_product_comment_criterion`, `id_lang`);'); - Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion_product` ADD PRIMARY KEY(`id_product`, `id_product_comment_criterion`);'); + Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_grade` ADD PRIMARY KEY (`id_product_comment`, `id_product_comment_criterion`);'); + Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion` DROP PRIMARY KEY, ADD PRIMARY KEY (`id_product_comment_criterion`, `id_lang`);'); + Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion_product` ADD PRIMARY KEY(`id_product`, `id_product_comment_criterion`);'); } } diff --git a/install-dev/upgrade/php/update_order_canada.php b/install-dev/upgrade/php/update_order_canada.php index e5a554f26..aba4749f8 100644 --- a/install-dev/upgrade/php/update_order_canada.php +++ b/install-dev/upgrade/php/update_order_canada.php @@ -99,7 +99,7 @@ function update_order_canada() { $values = rtrim($values, ","); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'order_tax` (id_order, tax_name, tax_rate, amount) VALUES '.$values); } diff --git a/install-dev/upgrade/php/update_order_detail_taxes.php b/install-dev/upgrade/php/update_order_detail_taxes.php index bce213851..7d701717d 100644 --- a/install-dev/upgrade/php/update_order_detail_taxes.php +++ b/install-dev/upgrade/php/update_order_detail_taxes.php @@ -36,7 +36,7 @@ function update_order_detail_taxes() { $tax_name = (isset($order_detail_tax['tax_name']) ? $order_detail_tax['tax_name'] : $alternative_tax_name); - Db::getInstance()->Execute( + Db::getInstance()->execute( 'INSERT INTO `'._DB_PREFIX_.'tax` (`rate`, `active`, `deleted`) VALUES (\''.(float)$order_detail_tax['tax_rate'].'\', 0, 1)' ); @@ -44,7 +44,7 @@ function update_order_detail_taxes() $id_tax = Db::getInstance()->Insert_ID(); foreach ($id_lang_list as $id_lang) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'tax_lang` (`id_tax`, `id_lang`, `name`) VALUES ('.(int)$id_tax.','.(int)$id_lang['id_lang'].',\''.pSQL($tax_name).'\') '); diff --git a/install-dev/upgrade/php/update_order_details.php b/install-dev/upgrade/php/update_order_details.php index 0b221df23..ced1d0e2e 100644 --- a/install-dev/upgrade/php/update_order_details.php +++ b/install-dev/upgrade/php/update_order_details.php @@ -27,12 +27,12 @@ function update_order_details() { - $res = Db::getInstance()->ExecuteS('SHOW COLUMNS FROM `'._DB_PREFIX_.'order_detail` LIKE \'reduction_percent\''); + $res = Db::getInstance()->executeS('SHOW COLUMNS FROM `'._DB_PREFIX_.'order_detail` LIKE \'reduction_percent\''); if (sizeof($res) == 0) { - Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_percent` DECIMAL(10, 2) NOT NULL default \'0.00\' AFTER `product_price`'); - Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_amount` DECIMAL(20, 6) NOT NULL default \'0.000000\' AFTER `reduction_percent`'); + Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_percent` DECIMAL(10, 2) NOT NULL default \'0.00\' AFTER `product_price`'); + Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_amount` DECIMAL(20, 6) NOT NULL default \'0.000000\' AFTER `reduction_percent`'); } } diff --git a/install-dev/upgrade/php/updateproductcomments.php b/install-dev/upgrade/php/updateproductcomments.php index 63e6bd906..f6d4dd697 100644 --- a/install-dev/upgrade/php/updateproductcomments.php +++ b/install-dev/upgrade/php/updateproductcomments.php @@ -27,31 +27,31 @@ function updateproductcomments() { - if (Db::getInstance()->ExecuteS('SELECT * FROM '._DB_PREFIX_.'product_comment') !== false) + if (Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'product_comment') !== false) { - Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_lang ( + Db::getInstance()->execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_lang ( `id_product_comment_criterion` INT( 11 ) UNSIGNED NOT NULL , `id_lang` INT(11) UNSIGNED NOT NULL , `name` VARCHAR(64) NOT NULL , PRIMARY KEY ( `id_product_comment_criterion` , `id_lang` ) ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8'); - Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_category ( + Db::getInstance()->execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_category ( `id_product_comment_criterion` int(10) unsigned NOT NULL, `id_category` int(10) unsigned NOT NULL, PRIMARY KEY(`id_product_comment_criterion`, `id_category`), KEY `id_category` (`id_category`) ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8'); - Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `id_guest` INT(11) NULL AFTER `id_customer`'); - Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `customer_name` varchar(64) NULL AFTER `content`'); - Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `deleted` tinyint(1) NOT NULL AFTER `validate`'); - Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_customer)'); - Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_guest)'); - Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_product)'); - Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `id_lang`'); - Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `name`'); - Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `id_product_comment_criterion_type` tinyint(1) NOT NULL AFTER `id_product_comment_criterion`'); - Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `active` tinyint(1) NOT NULL AFTER `id_product_comment_criterion_type`'); - Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment` ADD `title` VARCHAR(64) NULL AFTER `id_guest`;'); + Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `id_guest` INT(11) NULL AFTER `id_customer`'); + Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `customer_name` varchar(64) NULL AFTER `content`'); + Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `deleted` tinyint(1) NOT NULL AFTER `validate`'); + Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_customer)'); + Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_guest)'); + Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_product)'); + Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `id_lang`'); + Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `name`'); + Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `id_product_comment_criterion_type` tinyint(1) NOT NULL AFTER `id_product_comment_criterion`'); + Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `active` tinyint(1) NOT NULL AFTER `id_product_comment_criterion_type`'); + Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment` ADD `title` VARCHAR(64) NULL AFTER `id_guest`;'); } } diff --git a/install-dev/upgrade/php/updatetabicon_from_11version.php b/install-dev/upgrade/php/updatetabicon_from_11version.php index 5c71696e2..e3011cad1 100644 --- a/install-dev/upgrade/php/updatetabicon_from_11version.php +++ b/install-dev/upgrade/php/updatetabicon_from_11version.php @@ -30,7 +30,7 @@ function updatetabicon_from_11version() if (version_compare($oldversion,'1.5.0.0','<')) { - $rows = Db::getInstance()->ExecuteS('SELECT `id_tab`,`class_name` FROM '._DB_PREFIX_.'tab'); + $rows = Db::getInstance()->executeS('SELECT `id_tab`,`class_name` FROM '._DB_PREFIX_.'tab'); if (sizeof($rows)) { $img_dir = scandir(_PS_ROOT_DIR_.'/img/t/'); diff --git a/modules/blockcategories/config.xml b/modules/blockcategories/config.xml index 48e0de987..2db432f4a 100755 --- a/modules/blockcategories/config.xml +++ b/modules/blockcategories/config.xml @@ -1,12 +1,12 @@ - - blockcategories - - - - - - 1 - 1 + + blockcategories + + + + + + 0 + 1 - \ No newline at end of file + \ No newline at end of file diff --git a/modules/blocklayered/config.xml b/modules/blocklayered/config.xml index 1e217cdd6..7d3e15b8d 100644 --- a/modules/blocklayered/config.xml +++ b/modules/blocklayered/config.xml @@ -1,12 +1,12 @@ - - blocklayered - - - - - - 1 - 0 + + blocklayered + + + + + + 0 + 0 - \ No newline at end of file + \ No newline at end of file diff --git a/modules/blocklink/blocklink.php b/modules/blocklink/blocklink.php index 3e8c8957f..30cd6dc7a 100644 --- a/modules/blocklink/blocklink.php +++ b/modules/blocklink/blocklink.php @@ -184,7 +184,7 @@ class BlockLink extends Module } $assos_shop = Tools::getValue('checkBoxShopAsso_blocklink'); - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'blocklink_shop WHERE id_blocklink='.(int)$id_link); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'blocklink_shop WHERE id_blocklink='.(int)$id_link); foreach ($assos_shop as $asso) foreach ($asso as $id_shop => $row) Db::getInstance()->insert('blocklink_shop', array( diff --git a/modules/blockmyaccountfooter/blockmyaccountfooter.php b/modules/blockmyaccountfooter/blockmyaccountfooter.php index e32de4601..ab67980bd 100644 --- a/modules/blockmyaccountfooter/blockmyaccountfooter.php +++ b/modules/blockmyaccountfooter/blockmyaccountfooter.php @@ -77,12 +77,12 @@ class Blockmyaccountfooter extends Module private function addMyAccountBlockHook() { - return Db::getInstance()->Execute('INSERT IGNORE INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'myAccountBlockfooter\', \'My account block\', \'Display extra informations inside the "my account" block\', 1)'); + return Db::getInstance()->execute('INSERT IGNORE INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'myAccountBlockfooter\', \'My account block\', \'Display extra informations inside the "my account" block\', 1)'); } private function removeMyAccountBlockHook() { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'myAccountBlockfooter\''); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'myAccountBlockfooter\''); } public function hookHeader($params) diff --git a/modules/blockstore/config.xml b/modules/blockstore/config.xml index 292211119..8db51591e 100755 --- a/modules/blockstore/config.xml +++ b/modules/blockstore/config.xml @@ -1,12 +1,12 @@ - - blockstore - - - - - - 1 - 0 + + blockstore + + + + + + 0 + 0 - \ No newline at end of file + \ No newline at end of file diff --git a/modules/blocktopmenu/config.xml b/modules/blocktopmenu/config.xml index 74f812c5d..5a2ccc99e 100644 --- a/modules/blocktopmenu/config.xml +++ b/modules/blocktopmenu/config.xml @@ -1,12 +1,12 @@ - - blocktopmenu - - - - - - 1 - 1 + + blocktopmenu + + + + + + 0 + 1 - \ No newline at end of file + \ No newline at end of file diff --git a/modules/gsitemap/gsitemap.php b/modules/gsitemap/gsitemap.php index adbeab364..537926502 100644 --- a/modules/gsitemap/gsitemap.php +++ b/modules/gsitemap/gsitemap.php @@ -216,7 +216,7 @@ XML; /* Categories Generator */ if (Configuration::get('PS_REWRITING_SETTINGS')) - $categories = Db::getInstance()->ExecuteS(' + $categories = Db::getInstance()->executeS(' SELECT c.id_category, c.level_depth, link_rewrite, DATE_FORMAT(IF(date_upd,date_upd,date_add), \'%Y-%m-%d\') AS date_upd, cl.id_lang FROM '._DB_PREFIX_.'category c LEFT JOIN '._DB_PREFIX_.'category_lang cl ON c.id_category = cl.id_category @@ -224,7 +224,7 @@ XML; WHERE l.`active` = 1 AND c.`active` = 1 AND c.id_category != 1 ORDER BY cl.id_category, cl.id_lang ASC'); else - $categories = Db::getInstance()->ExecuteS( + $categories = Db::getInstance()->executeS( 'SELECT c.id_category, c.level_depth, DATE_FORMAT(IF(date_upd,date_upd,date_add), \'%Y-%m-%d\') AS date_upd FROM '._DB_PREFIX_.'category c ORDER BY c.id_category ASC'); @@ -259,7 +259,7 @@ XML; WHERE l.`active` = 1 ORDER BY cl.id_cms, cl.id_lang ASC'; - $cmss = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql_cms); + $cmss = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql_cms); foreach($cmss as $cms) { $tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ? diff --git a/modules/homeslider/config.xml b/modules/homeslider/config.xml index 2e1e7a56e..27f9f6ebb 100644 --- a/modules/homeslider/config.xml +++ b/modules/homeslider/config.xml @@ -1,12 +1,12 @@ - - homeslider - - - - - - 1 - 0 + + homeslider + + + + + + 0 + 0 - \ No newline at end of file + \ No newline at end of file diff --git a/modules/importerosc/importerosc.php b/modules/importerosc/importerosc.php index 004c9e716..a07e07e5d 100644 --- a/modules/importerosc/importerosc.php +++ b/modules/importerosc/importerosc.php @@ -120,7 +120,7 @@ class importerosc extends ImportModule { $identifier = 'id_lang'; - $langagues = $this->ExecuteS(' + $langagues = $this->executeS(' SELECT languages_id as id_lang, name as name, code as iso_code, 1 as active, (\'m/j/Y\') as date_format_lite, (\'m/j/Y H:i:s\') as date_format_full FROM `'.bqSQL($this->prefix).'languages` LIMIT '.(int)$limit.' , '.(int)$nrb_import); @@ -283,7 +283,7 @@ class importerosc extends ImportModule ORDER BY p.`products_id` LIMIT '.(int)($limit).' , '.(int)$nrb_import); - $this->Execute('CREATE TABLE IF NOT EXISTS`products_images` ( + $this->execute('CREATE TABLE IF NOT EXISTS`products_images` ( `id` int(11) NOT NULL AUTO_INCREMENT, `products_id` int(11) NOT NULL, `image` varchar(64) DEFAULT NULL, @@ -302,7 +302,7 @@ class importerosc extends ImportModule $product['link_rewrite'] = Tools::link_rewrite($product['name']); - $result = $this->ExecuteS('SELECT `categories_id` FROM `'.bqSQL($this->prefix).'products_to_categories` WHERE products_id = '.(int)$product['id_product']); + $result = $this->executeS('SELECT `categories_id` FROM `'.bqSQL($this->prefix).'products_to_categories` WHERE products_id = '.(int)$product['id_product']); $category_product = array('category_product' => array($product['id_category_default'] => $product['id_product'])); foreach($result as $res) $category_product['category_product'][$res['categories_id']] = $product['id_product']; @@ -498,7 +498,7 @@ class importerosc extends ImportModule public function checkCategoriesLevel() { - $columns = $this->ExecuteS('SHOW COLUMNS FROM `'.bqSQL($this->prefix).'categories` '); + $columns = $this->executeS('SHOW COLUMNS FROM `'.bqSQL($this->prefix).'categories` '); foreach($columns as $field) if ($field['Field'] == 'level') return true; @@ -591,7 +591,7 @@ class importerosc extends ImportModule public function createLevel() { - return $this->Execute('ALTER TABLE `'.bqSQL($this->prefix).'categories` ADD `level` INT NOT NULL'); + return $this->execute('ALTER TABLE `'.bqSQL($this->prefix).'categories` ADD `level` INT NOT NULL'); } public function calculateLevel() @@ -602,7 +602,7 @@ class importerosc extends ImportModule public function updateLevel($ids_cat, $level = 1) { - $this->Execute(' + $this->execute(' UPDATE `'.bqSQL($this->prefix).'categories` SET level = '.(int)$level.' WHERE categories_id IN ('.implode(',', $ids_cat).')'); @@ -614,7 +614,7 @@ class importerosc extends ImportModule public function getSubCat($id_parent) { - $result = $this->ExecuteS('SELECT `categories_id` FROM `'.bqSQL($this->prefix).'categories` WHERE `parent_id`='.(int)$id_parent); + $result = $this->executeS('SELECT `categories_id` FROM `'.bqSQL($this->prefix).'categories` WHERE `parent_id`='.(int)$id_parent); if (!is_array($result) OR empty($result)) return false; return $this->formatCategoriesIds($result); diff --git a/modules/mailalerts/MailAlert.php b/modules/mailalerts/MailAlert.php index 5f50b8f95..01b31ea19 100644 --- a/modules/mailalerts/MailAlert.php +++ b/modules/mailalerts/MailAlert.php @@ -251,7 +251,7 @@ class MailAlert extends ObjectModel FROM `'._DB_PREFIX_.self::$definition['table'].'` WHERE `id_product` = '.(int)$id_product.' AND `id_product_attribute` = '.(int)$id_product_attribute; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } } diff --git a/modules/mailalerts/config.xml b/modules/mailalerts/config.xml index 7d42bdd97..e2b548aaf 100755 --- a/modules/mailalerts/config.xml +++ b/modules/mailalerts/config.xml @@ -1,13 +1,13 @@ - - mailalerts - - - - - + + mailalerts + + + + + Are you sure you want to delete all customer notifications? - 1 - 1 + 0 + 1 - \ No newline at end of file + \ No newline at end of file diff --git a/modules/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php index 0a74c9637..ddea51052 100644 --- a/modules/mailalerts/mailalerts.php +++ b/modules/mailalerts/mailalerts.php @@ -496,7 +496,7 @@ class MailAlerts extends Module DELETE FROM `'._DB_PREFIX_.MailAlert::$definition['table'].'` WHERE `id_product` = '.(int)$params['product']->id; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } public function hookActionAttributeDelete($params) @@ -511,7 +511,7 @@ class MailAlerts extends Module WHERE `id_product_attribute` = '.(int)$params['id_product_attribute'].' AND `id_product` = '.(int)$params['id_product']; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } public function hookActionProductCoverage($params) diff --git a/modules/shopimporter/shopimporter.php b/modules/shopimporter/shopimporter.php index b1293fe3d..5a0af4ee0 100644 --- a/modules/shopimporter/shopimporter.php +++ b/modules/shopimporter/shopimporter.php @@ -1237,9 +1237,9 @@ class shopimporter extends ImportModule Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'country_lang'); Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'country'); case 'group' : - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer_group'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'group_lang'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'group'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer_group'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'group_lang'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'group'); break; case 'combination' : Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute');