From b1cc4f4bc9df76fb92e807c2e7b3d382da33ded6 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Tue, 14 Aug 2012 14:18:55 +0000 Subject: [PATCH] // Perfs and clean --- classes/Product.php | 6 +++--- install-dev/data/db_structure.sql | 5 +++-- install-dev/upgrade/sql/1.5.0.16.sql | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index 1d9a667bb..b19d7d7e8 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2711,10 +2711,10 @@ class ProductCore extends ObjectModel { if (!Combination::isFeatureActive()) $sql .= ' AND stock.id_product_attribute = 0'; - else if (is_numeric($product_attribute)) + elseif (is_numeric($product_attribute)) $sql .= ' AND stock.id_product_attribute = '.$product_attribute; - else if (is_string($product_attribute)) - $sql .= ' AND stock.id_product_attribute = IFNULL('.pSQL($product_attribute).'.id_product_attribute, 0)'; + elseif (is_string($product_attribute)) + $sql .= ' AND stock.id_product_attribute = IFNULL(`'.bqSQL($product_attribute).'`.id_product_attribute, 0)'; } $sql .= StockAvailable::addSqlShopRestriction(null, $id_shop, 'stock').' )'; diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql index e303476e5..8015930f3 100644 --- a/install-dev/data/db_structure.sql +++ b/install-dev/data/db_structure.sql @@ -1869,7 +1869,7 @@ CREATE TABLE `PREFIX_tax_rule` ( `description` VARCHAR( 100 ) NOT NULL, PRIMARY KEY (`id_tax_rule`), KEY `id_tax_rules_group` (`id_tax_rules_group`), - KEY `id_tax` (`id_tax`) + KEY `id_tax` (`id_tax`), KEY `category_getproducts` ( `id_tax_rules_group` , `id_country` , `id_state` , `zipcode_from` ) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; @@ -2214,7 +2214,8 @@ CREATE TABLE `PREFIX_stock_available` ( KEY `id_shop` (`id_shop`), KEY `id_shop_group` (`id_shop_group`), KEY `id_product` (`id_product`), - KEY `id_product_attribute` (`id_product_attribute`) + KEY `id_product_attribute` (`id_product_attribute`), + KEY `product_sqlstock` ( `id_product` , `id_product_attribute` , `id_shop` ) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_supply_order` ( diff --git a/install-dev/upgrade/sql/1.5.0.16.sql b/install-dev/upgrade/sql/1.5.0.16.sql index 96346250d..ffe327708 100644 --- a/install-dev/upgrade/sql/1.5.0.16.sql +++ b/install-dev/upgrade/sql/1.5.0.16.sql @@ -12,4 +12,5 @@ DELETE FROM `PREFIX_access` WHERE `id_tab` NOT IN (SELECT `id_tab` FROM `PREFIX_ UPDATE `PREFIX_employee` SET bo_theme = 'default'; -ALTER TABLE `PREFIX_tax_rule` ADD INDEX `category_getproducts` ( `id_tax_rules_group` , `id_country` , `id_state` , `zipcode_from` ) +ALTER TABLE `PREFIX_tax_rule` ADD INDEX `category_getproducts` ( `id_tax_rules_group` , `id_country` , `id_state` , `zipcode_from` ); +ALTER TABLE `PREFIX_stock_available` ADD INDEX `product_sqlstock` ( `id_product` , `id_product_attribute` , `id_shop` );