enhance where command array manipulation

Array of entities is replaced by array of entities' primary key values
for IN clause in where command.

Author: mibk

LeanMapperQuery/Query.php

@@ -494,11 +494,12 @@ private function commandWhere($cond)
 				$replacePlaceholders = TRUE;
 				$field = &$args[0];
 				list(, $field, $operator) = $matches;
-				$value = $args[1];
+				$value = &$args[1];
 
 				$placeholder = self::$defaultPlaceholder;
 				if (!$operator) {
 					if (is_array($value)) {
+						$value = $this->replaceEntitiesForItsPrimaryKeyValues($value);
 						$operator = 'IN';
 						$placeholder = '%in';
 					} elseif ($value === NULL) {
@@ -516,18 +517,24 @@ private function commandWhere($cond)
 			$statement = &$args[0];
 			$statement = $this->parseStatement($statement, $replacePlaceholders);
 			$statement = "($statement)";
-			// Replace instances of Entity for its values.
-			foreach ($args as &$arg) {
-				if ($arg instanceof LeanMapper\Entity) {
-					$entityTable = $this->mapper->getTable(get_class($arg));
-					$idField = $this->mapper->getEntityField($entityTable, $this->mapper->getPrimaryKey($entityTable));
-					$arg = $arg->$idField;
-				}
-			}
+			$args = $this->replaceEntitiesForItsPrimaryKeyValues($args);
 			call_user_func_array(array($this->fluent, 'where'),	$args);
 		}
 	}
 
+	private function replaceEntitiesForItsPrimaryKeyValues(array $entities)
+	{
+		foreach ($entities as &$entity) {
+			if ($entity instanceof LeanMapper\Entity) {
+				$entityTable = $this->mapper->getTable(get_class($entity));
+				// FIXME: Column name could be specified in the entity instead of mapper provided by 'getEntityField' function.
+				$idField = $this->mapper->getEntityField($entityTable, $this->mapper->getPrimaryKey($entityTable));
+				$entity = $entity->$idField;
+			}
+		}
+		return $entities;
+	}
+
 	private function commandOrderBy($field)
 	{
 		if (is_array($field)) {

tests/LeanMapperQuery/Query.where.phpt

@@ -5,6 +5,7 @@
  * @author Michal Bohuslávek
  */
 
+use LeanMapper;
 use LeanMapper\Entity;
 use Tester\Assert;
 
@@ -125,3 +126,26 @@ $expected = getFluent('book')
 	->where('([book_tag].[tag_id] = %i)', 2);
 
 Assert::same($expected->_export('WHERE'), $fluent->_export('WHERE'));
+
+////////////////
+
+class TagRepository extends LeanMapper\Repository
+{
+	public function findAll()
+	{
+		return $this->createEntities($this->createFluent()->fetchAll());
+	}
+}
+
+$tagRepository = new TagRepository($connection, $mapper, $entityFactory);
+$tags = $tagRepository->findAll();
+
+$fluent = getFluent('book');
+getQuery()
+	->where('@tags', $tags)
+	->applyQuery($fluent, $mapper);
+
+$expected = getFluent('book')
+	->where('([book_tag].[tag_id] IN %in)', array(1 => 1, 2));
+
+Assert::same($expected->_export('WHERE'), $fluent->_export('WHERE'));