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

// Fix // Fix left join on product_attribute_shop

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14813 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-04-23 13:29:24 +00:00
parent 64720081ef
commit e50fa1ae2a
6 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AttributeGroup.php
-1
View File
@@ -91,7 +91,6 @@ class AttributeGroupCore extends ObjectModel
$attribute_combinations = Db::getInstance()->executeS(' $attribute_combinations = Db::getInstance()->executeS('
SELECT pac.`id_attribute`, pa.`id_product_attribute` SELECT pac.`id_attribute`, pa.`id_product_attribute`
FROM `'._DB_PREFIX_.'product_attribute` pa FROM `'._DB_PREFIX_.'product_attribute` pa
'.Shop::addSqlAssociation('product_attribute', 'pa').'
LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac
ON (pa.`id_product_attribute` = pac.`id_product_attribute`) ON (pa.`id_product_attribute` = pac.`id_product_attribute`)
'); ');
classes/Product.php
+3 -6
View File
@@ -984,7 +984,6 @@ class ProductCore extends ObjectModel
$result = Db::getInstance()->executeS( $result = Db::getInstance()->executeS(
'SELECT pac.`id_attribute`, pac.`id_product_attribute` 'SELECT pac.`id_attribute`, pac.`id_product_attribute`
FROM `'._DB_PREFIX_.'product_attribute` pa FROM `'._DB_PREFIX_.'product_attribute` pa
'.Shop::addSqlAssociation('product_attribute', 'pa').'
LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON (pac.`id_product_attribute` = pa.`id_product_attribute`) LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON (pac.`id_product_attribute` = pa.`id_product_attribute`)
WHERE pa.`id_product` = '.(int)$this->id WHERE pa.`id_product` = '.(int)$this->id
); );
@@ -1827,7 +1826,7 @@ class ProductCore extends ObjectModel
{ {
$sql->select('pa.id_product_attribute'); $sql->select('pa.id_product_attribute');
$sql->leftOuterJoin('product_attribute', 'pa', 'p.`id_product` = pa.`id_product`'); $sql->leftOuterJoin('product_attribute', 'pa', 'p.`id_product` = pa.`id_product`');
$sql->join(Shop::addSqlAssociation('product_attribute', 'pa')); $sql->join(Shop::addSqlAssociation('product_attribute', 'pa', false));
$sql->where('product_attribute_shop.default_on = 1'); $sql->where('product_attribute_shop.default_on = 1');
} }
@@ -1901,7 +1900,7 @@ class ProductCore extends ObjectModel
FROM `'._DB_PREFIX_.'product` p FROM `'._DB_PREFIX_.'product` p
'.Shop::addSqlAssociation('product', 'p').' '.Shop::addSqlAssociation('product', 'p').'
LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (p.id_product = pa.id_product) LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (p.id_product = pa.id_product)
'.Shop::addSqlAssociation('product_attribute', 'pa').' '.Shop::addSqlAssociation('product_attribute', 'pa', false).'
WHERE product_shop.`active` = 1 WHERE product_shop.`active` = 1
'.(($ids_product) ? $ids_product : '').' '.(($ids_product) ? $ids_product : '').'
AND p.`id_product` IN ( AND p.`id_product` IN (
@@ -3070,7 +3069,7 @@ class ProductCore extends ObjectModel
if (Combination::isFeatureActive()) if (Combination::isFeatureActive())
{ {
$sql->leftJoin('product_attribute', 'pa', 'pa.`id_product` = p.`id_product`'); $sql->leftJoin('product_attribute', 'pa', 'pa.`id_product` = p.`id_product`');
$sql->join(Shop::addSqlAssociation('product_attribute', 'pa')); $sql->join(Shop::addSqlAssociation('product_attribute', 'pa', false));
$where .= ' OR pa.`reference` LIKE \'%'.pSQL($query).'%\''; $where .= ' OR pa.`reference` LIKE \'%'.pSQL($query).'%\'';
} }
$sql->where($where); $sql->where($where);
@@ -3105,7 +3104,6 @@ class ProductCore extends ObjectModel
$result = Db::getInstance()->executeS(' $result = Db::getInstance()->executeS('
SELECT * SELECT *
FROM `'._DB_PREFIX_.'product_attribute` pa FROM `'._DB_PREFIX_.'product_attribute` pa
'.Shop::addSqlAssociation('product_attribute', 'pa').'
WHERE pa.`id_product` = '.(int)$id_product_old WHERE pa.`id_product` = '.(int)$id_product_old
); );
@@ -4400,7 +4398,6 @@ class ProductCore extends ObjectModel
return Db::getInstance()->executeS(' return Db::getInstance()->executeS('
SELECT pa.id_product_attribute SELECT pa.id_product_attribute
FROM `'._DB_PREFIX_.'product_attribute` pa FROM `'._DB_PREFIX_.'product_attribute` pa
'.Shop::addSqlAssociation('product_attribute', 'pa').'
WHERE pa.`id_product` = '.(int)$id_product); WHERE pa.`id_product` = '.(int)$id_product);
} }
classes/SpecificPriceRule.php
+1 -1
View File
@@ -222,7 +222,7 @@ class SpecificPriceRuleCore extends ObjectModel
{ {
$query->select('pa.id_product_attribute'); $query->select('pa.id_product_attribute');
$query->leftJoin('product_attribute', 'pa', 'p.id_product = pa.id_product'); $query->leftJoin('product_attribute', 'pa', 'p.id_product = pa.id_product');
$query->join(Shop::addSqlAssociation('product_attribute', 'pa')); $query->join(Shop::addSqlAssociation('product_attribute', 'pa', false));
$query->leftJoin('product_attribute_combination', 'pac', 'pa.id_product_attribute = pac.id_product_attribute'); $query->leftJoin('product_attribute_combination', 'pac', 'pa.id_product_attribute = pac.id_product_attribute');
$query->groupBy('pa.id_product_attribute'); $query->groupBy('pa.id_product_attribute');
} }
classes/stock/StockManager.php
+1 -1
View File
@@ -594,7 +594,7 @@ class StockManagerCore implements StockManagerInterface
LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = s.`id_product`) LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = s.`id_product`)
'.Shop::addSqlAssociation('product', 'p').' '.Shop::addSqlAssociation('product', 'p').'
LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (p.`id_product` = pa.`id_product`) LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (p.`id_product` = pa.`id_product`)
'.Shop::addSqlAssociation('product_attribute', 'pa').' '.Shop::addSqlAssociation('product_attribute', 'pa', false).'
WHERE sm.`sign` = -1 WHERE sm.`sign` = -1
AND sm.`id_stock_mvt_reason` != '.Configuration::get('PS_STOCK_MVT_TRANSFER_FROM').' AND sm.`id_stock_mvt_reason` != '.Configuration::get('PS_STOCK_MVT_TRANSFER_FROM').'
AND TO_DAYS(NOW()) - TO_DAYS(sm.`date_add`) <= '.(int)$coverage.' AND TO_DAYS(NOW()) - TO_DAYS(sm.`date_add`) <= '.(int)$coverage.'
controllers/admin/AdminStockCoverController.php
+1 -1
View File
@@ -189,7 +189,7 @@ class AdminStockCoverControllerCore extends AdminController
// query // query
$this->_select = 'a.id_product as id, COUNT(pa.id_product_attribute) as variations, SUM(s.usable_quantity) as stock'; $this->_select = 'a.id_product as id, COUNT(pa.id_product_attribute) as variations, SUM(s.usable_quantity) as stock';
$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (pa.id_product = a.id_product) $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (pa.id_product = a.id_product)
'.Shop::addSqlAssociation('product_attribute', 'pa').' '.Shop::addSqlAssociation('product_attribute', 'pa', false).'
INNER JOIN `'._DB_PREFIX_.'stock` s ON (s.id_product = a.id_product)'; INNER JOIN `'._DB_PREFIX_.'stock` s ON (s.id_product = a.id_product)';
self::$currentIndex .= '&coverage_period='.(int)$this->getCurrentCoveragePeriod().'&warn_days='.(int)$this->getCurrentWarning(); self::$currentIndex .= '&coverage_period='.(int)$this->getCurrentCoveragePeriod().'&warn_days='.(int)$this->getCurrentWarning();
modules/favoriteproducts/FavoriteProduct.php
+1 -1
View File
@@ -67,7 +67,7 @@ class FavoriteProduct extends ObjectModel
AND pl.`id_lang` = '.(int)$id_lang AND pl.`id_lang` = '.(int)$id_lang
.Shop::addSqlRestrictionOnLang('pl').' .Shop::addSqlRestrictionOnLang('pl').'
LEFT OUTER JOIN `'._DB_PREFIX_.'product_attribute` pa ON (p.`id_product` = pa.`id_product`) LEFT OUTER JOIN `'._DB_PREFIX_.'product_attribute` pa ON (p.`id_product` = pa.`id_product`)
'.Shop::addSqlAssociation('product_attribute', 'pa').' '.Shop::addSqlAssociation('product_attribute', 'pa', false).'
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1) LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1)
LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.') LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
WHERE product_shop.`active` = 1 WHERE product_shop.`active` = 1