Map data to entity by identity if any exists in identity map

Author: Marco Bunge

src/AbstractMapper.php

@@ -27,6 +27,11 @@ abstract class AbstractMapper implements Mapper
      */
     protected $tableName;
 
+    /**
+     * @var string
+     */
+    protected $tableNameAlias;
+
     /**
      * @var string[]
      */
@@ -279,14 +284,20 @@ public function select(callable $queryCallback, $fields = ['*'], $one = false)
         }
 
         $set = [];
+        $identityMap = $this->getIdentityMap();
+
         foreach ($recordSet as $record) {
-//            if(isset($record[$this->getLastInsertIdReference()])){
-//                if($this->getIdentityMap()->hasId($record[$this->getLastInsertIdReference()])){
-//                    $set[] = $this->getIdentityMap()->getObject($record[$this->getLastInsertIdReference()]);
-//                    continue;
-//                }
-//            }
-            $set[] = $this->map($record);
+            $entity = null;
+            // fetch entity from identity map
+            // keeping object id
+            if(isset($record[$this->getLastInsertIdReference()])){
+                if($identityMap->hasId($record[$this->getLastInsertIdReference()])){
+                    $entity = $identityMap->getObject($record[$this->getLastInsertIdReference()]);
+                }
+            }
+
+            // map record to entity
+            $set[] = $this->map($record, $entity);
         }
 
         reset($set);
@@ -528,6 +539,10 @@ private function doDefine()
         if (empty($this->tableName)) {
             $this->tableName = Inflector::tableize(get_class($this->entityClass));
         }
+        //sanitize and validate table name alias
+        if (empty($this->tableName)) {
+            $this->tableNameAlias = substr($this->tableName, 3);
+        }
 
     }
 

src/Mapper.php

@@ -36,6 +36,11 @@ public function getEntityClass();
      */
     public function getTableName();
 
+    /**
+     * @return string
+     */
+    public function getTableNameAlias();
+
     /**
      * @return string[]
      */