MAGETWO-32116: Customer model and tables cleaning

Author: irenelagno

app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php

@@ -96,16 +96,6 @@ public function setStoreId($storeId)
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     * Redeclare method to disable entity_type_id filter
-     */
-    protected function _initSelect()
-    {
-        $this->getSelect()->from(['e' => $this->getEntity()->getEntityTable()]);
-        return $this;
-    }
-
     /**
      * Return current store id
      *

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -958,7 +958,7 @@ public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
             );
         }
 
-        if (!$this->getEntityTable()) {
+        if ($this->getEntityTable() == \Magento\Eav\Model\Entity::DEFAULT_ENTITY_TABLE) {
             $bind['entity_type_id'] = $this->getTypeId();
             $select->where('entity_type_id = :entity_type_id');
         }
@@ -1159,7 +1159,9 @@ public function save(\Magento\Framework\Object $object)
                     $this->loadAllAttributes($object);
                 }
 
-                if (!$this->getEntityTable() && !$object->getEntityTypeId()) {
+                if ($this->getEntityTable() ==  \Magento\Eav\Model\Entity::DEFAULT_ENTITY_TABLE
+                    && !$object->getEntityTypeId()
+                ) {
                     $object->setEntityTypeId($this->getTypeId());
                 }
 

app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php

@@ -113,13 +113,6 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
      */
     protected $_universalFactory;
 
-    /**
-     * Specific entity types which not required "entity_type_id" for select
-     *
-     * @var array
-     */
-    protected $entityTypes = ['customer', 'customer_address'];
-
     /**
      * @param \Magento\Core\Model\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
@@ -199,7 +192,7 @@ protected function _initSelect()
     {
         $this->getSelect()->from(['e' => $this->getEntity()->getEntityTable()]);
         $entity = $this->getEntity();
-        if ($entity->getTypeId() && !in_array($entity->getType(), $this->entityTypes)) {
+        if ($entity->getTypeId() && $entity->getEntityTable() == \Magento\Eav\Model\Entity::DEFAULT_ENTITY_TABLE ) {
             $this->addAttributeToFilter('entity_type_id', $this->getEntity()->getTypeId());
         }
         return $this;
@@ -1169,7 +1162,8 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
         if (empty($attributeIds)) {
             $attributeIds = $this->_selectAttributes;
         }
-        $entityIdField = $this->getEntity()->getEntityIdField();
+        $entity = $this->getEntity();
+        $entityIdField = $entity->getEntityIdField();
         $select = $this->getConnection()->select()->from(
             $table,
             [$entityIdField, 'attribute_id']
@@ -1181,10 +1175,10 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
             $attributeIds
         );
 
-        if (!in_array($this->getEntity()->getType(), $this->entityTypes)) {
+        if ($entity->getEntityTable() == \Magento\Eav\Model\Entity::DEFAULT_ENTITY_TABLE && $entity->getTypeId()) {
             $select->where(
                 'entity_type_id =?',
-                $this->getEntity()->getTypeId()
+                $entity->getTypeId()
             );
         }
         return $select;