Reworked query in getAttributeRawValue so that it returns a store specific value even if there is no default value

Author: semajeg

app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php

@@ -560,15 +560,19 @@ public function getAttributeRawValue($entityId, $attribute, $store)
         $store = (int) $store;
         if ($typedAttributes) {
             foreach ($typedAttributes as $table => $_attributes) {
+                $defaultJoinCondition = [
+                    $connection->quoteInto('default_value.attribute_id IN (?)', array_keys($_attributes)),
+                    "default_value.{$this->getLinkField()} = e.{$this->getLinkField()}",
+                    'default_value.store_id = 0',
+                ];
+
                 $select = $connection->select()
-                    ->from(['default_value' => $table], ['attribute_id'])
-                    ->join(
-                        ['e' => $this->getTable($this->getEntityTable())],
-                        'e.' . $this->getLinkField() . ' = ' . 'default_value.' . $this->getLinkField(),
-                        ''
-                    )->where('default_value.attribute_id IN (?)', array_keys($_attributes))
-                    ->where("e.entity_id = :entity_id")
-                    ->where('default_value.store_id = ?', 0);
+                    ->from(['e' => $this->getTable($this->getEntityTable())], [])
+                    ->joinLeft(
+                        ['default_value' => $table],
+                        implode(' AND ', $defaultJoinCondition),
+                        []
+                    )->where("e.entity_id = :entity_id");
 
                 $bind = ['entity_id' => $entityId];
 
@@ -578,6 +582,11 @@ public function getAttributeRawValue($entityId, $attribute, $store)
                         'default_value.value',
                         'store_value.value'
                     );
+                    $attributeIdExpr = $connection->getCheckSql(
+                        'store_value.attribute_id IS NULL',
+                        'default_value.attribute_id',
+                        'store_value.attribute_id'
+                    );
                     $joinCondition = [
                         $connection->quoteInto('store_value.attribute_id IN (?)', array_keys($_attributes)),
                         "store_value.{$this->getLinkField()} = e.{$this->getLinkField()}",
@@ -587,18 +596,23 @@ public function getAttributeRawValue($entityId, $attribute, $store)
                     $select->joinLeft(
                         ['store_value' => $table],
                         implode(' AND ', $joinCondition),
-                        ['attr_value' => $valueExpr]
+                        ['attribute_id' => $attributeIdExpr, 'attr_value' => $valueExpr]
                     );
 
                     $bind['store_id'] = $store;
                 } else {
-                    $select->columns(['attr_value' => 'value'], 'default_value');
+                    $select->columns(
+                        ['attribute_id' => 'attribute_id', 'attr_value' => 'value'],
+                        'default_value'
+                    );
                 }
 
                 $result = $connection->fetchPairs($select, $bind);
                 foreach ($result as $attrId => $value) {
-                    $attrCode = $typedAttributes[$table][$attrId];
-                    $attributesData[$attrCode] = $value;
+                    if ($attrId !== '') {
+                        $attrCode = $typedAttributes[$table][$attrId];
+                        $attributesData[$attrCode] = $value;
+                    }
                 }
             }
         }