Improved Entity::__isset

LeanMapper/Entity.php

@@ -161,6 +161,7 @@ public function __set($name, $value)
 	 * Tells whether given property exists and is not null
 	 *
 	 * @param string $name
+	 * @throws LeanMapperException
 	 * @return bool
 	 */
 	public function __isset($name)
@@ -169,6 +170,11 @@ public function __isset($name)
 			return $this->$name !== null;
 		} catch (MemberAccessException $e) {
 			return false;
+		} catch (LeanMapperException $e) {
+			if ($this->isDetached() and $e->getCode() === Result::ERROR_MISSING_COLUMN) {
+				return false;
+			}
+			throw $e;
 		}
 	}
 
@@ -447,7 +453,7 @@ protected function get($property, array $filterArgs = array())
 			try {
 				$value = $this->row->$column;
 			} catch (LeanMapperException $e) {
-				throw new LeanMapperException("Cannot get value of property '{$property->getName()}' in entity " . get_called_class() . ' due to low-level failure: ' . $e->getMessage());
+				throw new LeanMapperException("Cannot get value of property '{$property->getName()}' in entity " . get_called_class() . ' due to low-level failure: ' . $e->getMessage(), $e->getCode());
 			}
 			if ($pass !== null) {
 				$value = $this->$pass($value);
@@ -491,7 +497,7 @@ protected function get($property, array $filterArgs = array())
 		try {
 			$value = $this->row->$column;
 		} catch (LeanMapperException $e) {
-			throw new LeanMapperException("Cannot get value of property '{$property->getName()}' in entity " . get_called_class() . ' due to low-level failure: ' . $e->getMessage());
+			throw new LeanMapperException("Cannot get value of property '{$property->getName()}' in entity " . get_called_class() . ' due to low-level failure: ' . $e->getMessage(), $e->getCode());
 		}
 		if ($pass !== null) {
 			$value = $this->$pass($value);
@@ -707,6 +713,7 @@ private function getHasOneValue(Property $property, Relationship\HasOne $relatio
 			return null;
 		} else {
 			$entityClass = $this->mapper->getEntityClass($targetTable, $row);
+
 			$entity = $this->entityFactory->createEntity($entityClass, $row);
 			$this->checkConsistency($property, $entityClass, $entity);
 			$entity->makeAlive($this->entityFactory);

LeanMapper/Result.php

@@ -35,6 +35,8 @@ class Result implements \Iterator
 
 	const PRELOADED_KEY = 'preloaded';
 
+	const ERROR_MISSING_COLUMN = 1;
+
 	/** @var bool */
 	private $isDetached;
 
@@ -210,7 +212,7 @@ public function getDataEntry($id, $key)
 			$key = $this->trimAlias($key);
 		}
 		if (!array_key_exists($key, $this->data[$id])) {
-			throw new InvalidArgumentException("Missing '$key' column in row with id $id.");
+			throw new InvalidArgumentException("Missing '$key' column in row with id $id.", self::ERROR_MISSING_COLUMN);
 		}
 		return $this->data[$id][$key];
 	}

tests/LeanMapper/Entity.isset.phpt

@@ -0,0 +1,29 @@
+<?php
+
+use LeanMapper\Entity;
+use LeanMapper\Exception\Exception;
+use LeanMapper\Result;
+use Tester\Assert;
+
+require_once __DIR__ . '/../bootstrap.php';
+
+/**
+ * @property int $id
+ * @property string $name
+ */
+class Author extends Entity
+{
+}
+
+$author = new Author;
+
+isset($author->name);
+
+//////////
+
+$author->makeAlive($entityFactory, $connection, $mapper);
+$author->attach(1);
+
+Assert::exception(function () use ($author) {
+	isset($author->name);
+}, Exception::class, null, Result::ERROR_MISSING_COLUMN);