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/Product.php
+3 -6
View File
@@ -984,7 +984,6 @@ class ProductCore extends ObjectModel
$result = Db::getInstance()->executeS(
'SELECT pac.`id_attribute`, pac.`id_product_attribute`
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`)
WHERE pa.`id_product` = '.(int)$this->id
);
@@ -1827,7 +1826,7 @@ class ProductCore extends ObjectModel
{
$sql->select('pa.id_product_attribute');
$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');
}
@@ -1901,7 +1900,7 @@ class ProductCore extends ObjectModel
FROM `'._DB_PREFIX_.'product` p
'.Shop::addSqlAssociation('product', 'p').'
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
'.(($ids_product) ? $ids_product : '').'
AND p.`id_product` IN (
@@ -3070,7 +3069,7 @@ class ProductCore extends ObjectModel
if (Combination::isFeatureActive())
{
$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).'%\'';
}
$sql->where($where);
@@ -3105,7 +3104,6 @@ class ProductCore extends ObjectModel
$result = Db::getInstance()->executeS('
SELECT *
FROM `'._DB_PREFIX_.'product_attribute` pa
'.Shop::addSqlAssociation('product_attribute', 'pa').'
WHERE pa.`id_product` = '.(int)$id_product_old
);
@@ -4400,7 +4398,6 @@ class ProductCore extends ObjectModel
return Db::getInstance()->executeS('
SELECT pa.id_product_attribute
FROM `'._DB_PREFIX_.'product_attribute` pa
'.Shop::addSqlAssociation('product_attribute', 'pa').'
WHERE pa.`id_product` = '.(int)$id_product);
}