ActiveRow: optimization

Author: dg

src/Database/Table/ActiveRow.php

@@ -281,8 +281,7 @@ public function __set($key, $value)
 	 */
 	public function &__get($key)
 	{
-		$this->accessColumn($key);
-		if (array_key_exists($key, $this->data)) {
+		if ($this->accessColumn($key)) {
 			return $this->data[$key];
 		}
 
@@ -300,8 +299,7 @@ public function &__get($key)
 
 	public function __isset($key)
 	{
-		$this->accessColumn($key);
-		if (array_key_exists($key, $this->data)) {
+		if ($this->accessColumn($key)) {
 			return isset($this->data[$key]);
 		}
 		$this->removeAccessColumn($key);
@@ -320,15 +318,14 @@ public function __unset($key)
 	 */
 	public function accessColumn($key, $selectColumn = TRUE)
 	{
-		$this->table->accessColumn($key, $selectColumn);
-		if ($this->table->getDataRefreshed() && !$this->dataRefreshed) {
+		if ($this->table->accessColumn($key, $selectColumn) && !$this->dataRefreshed) {
 			if (!isset($this->table[$this->getSignature()])) {
 				throw new Nette\InvalidStateException('Database refetch failed; row does not exist!');
 			}
 			$this->data = $this->table[$this->getSignature()]->data;
 			$this->dataRefreshed = TRUE;
 		}
-		return array_key_exists($key, $this->data);
+		return isset($this->data[$key]) || array_key_exists($key, $this->data);
 	}
 
 

src/Database/Table/Selection.php

@@ -644,11 +644,12 @@ protected function getSpecificCacheKey()
 	 * @internal
 	 * @param  string|NULL column name or NULL to reload all columns
 	 * @param  bool
+	 * @return bool if selection requeried for more columns.
 	 */
 	public function accessColumn($key, $selectColumn = TRUE)
 	{
 		if (!$this->cache) {
-			return;
+			return FALSE;
 		}
 
 		if ($key === NULL) {
@@ -658,7 +659,7 @@ public function accessColumn($key, $selectColumn = TRUE)
 			$this->accessedColumns[$key] = $selectColumn;
 		}
 
-		if ($selectColumn && !$this->sqlBuilder->getSelect() && $this->previousAccessedColumns && ($key === NULL || !isset($this->previousAccessedColumns[$key]))) {
+		if ($selectColumn && $this->previousAccessedColumns && ($key === NULL || !isset($this->previousAccessedColumns[$key])) && !$this->sqlBuilder->getSelect()) {
 			$this->previousAccessedColumns = [];
 
 			if ($this->sqlBuilder->getLimit()) {
@@ -693,6 +694,7 @@ public function accessColumn($key, $selectColumn = TRUE)
 				}
 			}
 		}
+		return $this->dataRefreshed;
 	}