MC-19916: Attribute not showing on layered navigation if no value set for "All Store Views"

Author: rostyslav-hymon

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php

@@ -210,12 +210,16 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
             $selectWithoutDefaultStore = $connection->select()->from(
                 ['wd' => $this->getTable('catalog_product_entity_int')],
                 [
-                    $productIdField,
+                    'cpe.entity_id',
                     'attribute_id',
                     'store_id',
                     'value',
-                    $productIdField
+                    'cpe.entity_id',
                 ]
+            )->joinLeft(
+                ['cpe' => $this->getTable('catalog_product_entity')],
+                "cpe.{$productIdField} = wd.{$productIdField}",
+                []
             )->joinLeft(
                 ['d2d' => $this->getTable('catalog_product_entity_int')],
                 sprintf(
@@ -233,7 +237,7 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
                 ->where("wd.attribute_id IN({$attrIdsFlat})")
                 ->where('wd.value IS NOT NULL')
                 ->where('wd.store_id != 0')
-                ->where("wd.{$productIdField} IN({$ids})");
+                ->where("cpe.entity_id IN({$ids})");
             $select->where("cpe.entity_id IN({$ids})");
             $selects = new UnionExpression(
                 [$select, $selectWithoutDefaultStore],