From b39e14404cfeac177d41b152690b6adbb2b1e4bf Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 3 May 2013 14:32:40 +0200
Subject: [PATCH] ensure accessing a cell on ref update

---
 lib/pq/Gateway/Row.php            | 19 ++++++++++++++-----
 tests/lib/pq/Gateway/CellTest.php | 11 +++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/lib/pq/Gateway/Row.php b/lib/pq/Gateway/Row.php
index 6d9c19e..cda8d4a 100644
--- a/lib/pq/Gateway/Row.php
+++ b/lib/pq/Gateway/Row.php
@@ -184,6 +184,18 @@ class Row implements \JsonSerializable
 		return $changes;
 	}
 	
+	/**
+	 * Cell accessor
+	 * @param string $p column name
+	 * @return \pq\Gateway\Cell
+	 */
+	protected function cell($p) {
+		if (!isset($this->cell[$p])) {
+			$this->cell[$p] = new Cell($this, $p, isset($this->data[$p]) ? $this->data[$p] : null);
+		}
+		return $this->cell[$p];
+	}
+	
 	/**
 	 * Get a cell or parent rows
 	 * @param string $p
@@ -193,10 +205,7 @@ class Row implements \JsonSerializable
 		if ($this->table->hasRelation($p)) {
 			return $this->table->by($this, $p);
 		}
-		if (!isset($this->cell[$p])) {
-			$this->cell[$p] = new Cell($this, $p, isset($this->data[$p]) ? $this->data[$p] : null);
-		}
-		return $this->cell[$p];
+		return $this->cell($p);
 	}
 	
 	/**
@@ -205,7 +214,7 @@ class Row implements \JsonSerializable
 	 * @param mixed $v
 	 */
 	function __set($p, $v) {
-		$this->__get($p)->set($v);
+		$this->cell($p)->set($v);
 	}
 	
 	/**
diff --git a/tests/lib/pq/Gateway/CellTest.php b/tests/lib/pq/Gateway/CellTest.php
index fc08ba6..9235a39 100644
--- a/tests/lib/pq/Gateway/CellTest.php
+++ b/tests/lib/pq/Gateway/CellTest.php
@@ -50,4 +50,15 @@ class CellTest extends \PHPUnit_Framework_TestCase {
 			$this->assertEquals("$key + 123 || 'foobar' - now()", (string) $row->$key);
 		}
 	}
+	
+	public function testRef() {
+		$rows = $this->table->find(null, "id desc", 2);
+		$reft = new Table("reftest");
+		$refs = new Rowset($reft);
+		$refs->append($rows->seek(0)->current()->reftest()->current());
+		$refs->append($rows->seek(1)->current()->reftest()->current());
+		$refs->seek(0)->current()->test = $rows->seek(1)->current();
+		$refs->seek(1)->current()->test = $rows->seek(0)->current();
+		$refs->update();
+	}
 }
-- 
2.30.2